Isaac Connor
|
e4693c251c
|
add backticks around field names because some like Function are reserved
|
2022-01-12 23:08:29 -05:00 |
|
Isaac Connor
|
8d06175024
|
Rework to use ZoneMinder::Monitor class. Simplify loadMonitors and get rid of loadMonitor. Add in ServerId change handling.
|
2022-01-12 23:07:48 -05:00 |
|
Isaac Connor
|
c9db5f44a4
|
cherry pick Add check to prevent tight busy loop if ONVIF setup fails
|
2022-01-12 12:05:33 -05:00 |
|
Isaac Connor
|
aaaf87abdb
|
Don't try again if the error was ENOSPACE. it crashes and there is just no point.
|
2022-01-11 09:08:01 -05:00 |
|
Isaac Connor
|
90cbf5a018
|
Fix == instead of =
|
2022-01-11 09:06:43 -05:00 |
|
Isaac Connor
|
b88e699d7e
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-01-10 19:56:04 -05:00 |
|
Isaac Connor
|
81fc392bc2
|
If error is ENOSPACE just give up. ffmpeg crashes if we try again.
|
2022-01-10 19:56:00 -05:00 |
Isaac Connor
|
cb30f7639f
|
revert broken commit. Isaac doesn't know what he's doing.
|
2022-01-10 18:47:26 -05:00 |
|
Isaac Connor
|
a0c34f0d96
|
Fix. cppcheck was wrong about divider being able to go into deeper scope.
|
2022-01-10 18:33:01 -05:00 |
|
Isaac Connor
|
3f7b9dfff7
|
fix cppcheck error about lo_x. Inner scope overwriting it.
|
2022-01-10 17:36:50 -05:00 |
|
Isaac Connor
|
376d7fd7e5
|
log error if avcodec_parameters_to_context fails. Mostly to quiet cppcheck. Remove duplicated assignment to sample_fmt.
|
2022-01-10 17:36:50 -05:00 |
|
Isaac Connor
|
78a10b6095
|
cppcheck fixes
|
2022-01-10 17:36:49 -05:00 |
|
Isaac Connor
|
9f86fd3b16
|
add default_width and height to constructor
|
2022-01-10 17:36:49 -05:00 |
|
Isaac Connor
|
4697e36f11
|
add explicit
|
2022-01-10 17:36:49 -05:00 |
|
Isaac Connor
|
037771539d
|
spacing, return a success value from setupCodec instead of using Fatal
|
2022-01-10 17:36:49 -05:00 |
|
Isaac Connor
|
b406bf8fd1
|
remove last_send_image_width/height. Not really useful or relevant
|
2022-01-10 17:36:49 -05:00 |
|
Isaac Connor
|
ed7bc7c4b4
|
whitespace
|
2022-01-10 15:25:15 -05:00 |
|
Isaac Connor
|
ec95c8da57
|
Rename the monitor type define from CURL to LIBCURL to fix namespace conflict
|
2022-01-10 15:25:15 -05:00 |
|
Isaac Connor
|
3f7e4c67a0
|
Provide better logging when there is no data passwed to setAlarmCues
|
2022-01-10 15:25:15 -05:00 |
|
Isaac Connor
|
947132284d
|
When transitioning from ALERT to IDLE, close the event if CLOSE_MODE is IDLE as well as ALARM.
|
2022-01-10 14:44:52 -05:00 |
|
Isaac Connor
|
701045393c
|
fix typo
|
2022-01-10 09:07:59 -05:00 |
|
Isaac Connor
|
e9db12ca94
|
Fix importance got cutnpasted to where it shouldn't be
|
2022-01-09 14:46:48 -05:00 |
|
Isaac Connor
|
21762585d9
|
rework getting second packet for de-interlace. Pass notesetmap by reference
|
2022-01-09 14:43:23 -05:00 |
|
Isaac Connor
|
1f6874dd53
|
add explicit
|
2022-01-09 14:43:23 -05:00 |
|
Isaac Connor
|
f0c6413dc8
|
solve ccpcheck complaints
|
2022-01-09 14:43:23 -05:00 |
|
Isaac Connor
|
c832fabafd
|
solve ccpcheck complaints
|
2022-01-09 14:43:23 -05:00 |
|
Isaac Connor
|
af8964c043
|
Merge pull request #3406 from jp-bennett/master
Continued work on ONVIF
|
2022-01-08 15:19:51 -05:00 |
Jonathan Bennett
|
52b377ca86
|
Adds the 'closes_event" ONVIF option, to handle motionDetection message quirks.
|
2022-01-08 14:05:57 -06:00 |
|
Jonathan Bennett
|
a3c298ca93
|
Add nullptr checks to prevent a crash when in NODECT mode
|
2022-01-08 13:17:04 -06:00 |
|
Isaac Connor
|
a153798b47
|
fix init when no GSOAP
|
2022-01-08 12:37:23 -05:00 |
|
Isaac Connor
|
f01ecf2a16
|
Add libgsoap to dependencies
|
2022-01-08 12:37:05 -05:00 |
|
Isaac Connor
|
dc975daa7a
|
init soap to null in constructor. Stop analysis thread before destroying soap.
|
2022-01-08 12:21:29 -05:00 |
|
Isaac Connor
|
c8bc0661b1
|
Have to clear src before resetting or some browsers won't load the new image
|
2022-01-08 12:14:28 -05:00 |
|
Isaac Connor
|
36a493ad5e
|
bump to 1.37.7
|
2022-01-07 16:35:52 -05:00 |
|
Isaac Connor
|
a2a04edcf7
|
Only init gsoap if we are capturing
|
2022-01-07 16:31:45 -05:00 |
|
Isaac Connor
|
71ff1e3cea
|
Add translates for analyse button. Fixup styles
|
2022-01-07 16:30:14 -05:00 |
|
Isaac Connor
|
a679455a0b
|
Merge branch 'master' into merge_work_on_zms
|
2022-01-07 16:22:51 -05:00 |
|
Isaac Connor
|
deaff43f66
|
use let/const
|
2022-01-07 16:22:24 -05:00 |
|
Isaac Connor
|
8f372e6a6c
|
Add useful title to frame image telling us which we are looking at
|
2022-01-07 16:22:11 -05:00 |
|
Isaac Connor
|
cfac99be4e
|
better debugging when the row has no Id
|
2022-01-07 16:21:49 -05:00 |
|
Isaac Connor
|
79c45f50d5
|
define raw as an empty array so we don't generate js errors
|
2022-01-07 16:21:34 -05:00 |
|
Isaac Connor
|
038bff0df2
|
Add analyse button
|
2022-01-07 16:06:53 -05:00 |
|
Isaac Connor
|
1a3bee102f
|
analyze->analyse, fixup how we show enabled/disabled and start with analysis frame displayed
|
2022-01-07 16:06:38 -05:00 |
|
Isaac Connor
|
939f165b22
|
rename analyze to analyse
|
2022-01-07 16:05:52 -05:00 |
|
Isaac Connor
|
76fe20c69f
|
Only send analysis_frame if doing motion detection. Add debuging. Remove other debugging
|
2022-01-07 15:57:28 -05:00 |
|
Isaac Connor
|
f4c813a26f
|
Assign image to analysis_image before doing motion detection so there is always an image to see. Fix crash.
|
2022-01-07 15:57:01 -05:00 |
|
Isaac Connor
|
7219809364
|
Add CMD_ANALYZE_ON/OFF
|
2022-01-07 14:00:36 -05:00 |
|
Isaac Connor
|
c914f00126
|
browser doesn't seem to like step=0.01
add analyze_frames button handling and update to jquery instead of mootools styles
|
2022-01-07 13:59:45 -05:00 |
|
Isaac Connor
|
6f5eee6c0f
|
Add show_analyze_frames function to tell zms to send analysis frames
|
2022-01-07 13:53:49 -05:00 |
|
Isaac Connor
|
df0a0c7853
|
Add CMD_ANALYZE_ON and OFF
|
2022-01-07 13:50:40 -05:00 |