Commit Graph

19991 Commits

Author SHA1 Message Date
Isaac Connor 5840602b6e
Merge pull request #3404 from jp-bennett/master
Adds ONVIF motion Detection
2022-01-07 10:35:32 -05:00
Isaac Connor 6d3c6330df Fix freebsd build by fixing incorrect use of SystemTimePoint when we want TimePoint 2022-01-07 10:34:44 -05:00
Jonathan Bennett 1333d8c751 Adds ONVIF Motion Detection Support 2022-01-06 16:45:15 -06:00
Isaac Connor c5ae080746 further replace function with recording/analysing. One result of this is we can be in ALERT/ALARM status without recording. 2022-01-05 21:26:46 -05:00
Isaac Connor dadf53f99d Merge branch 'master' into multistream 2022-01-05 20:20:45 -05:00
Isaac Connor 738c252948 load onvif settings and provide accessors 2022-01-05 20:15:39 -05:00
Isaac Connor f7c90f5c41 Replace some function with recording == and analysis== 2022-01-05 19:53:30 -05:00
Isaac Connor 99900e8c1d Merge branch 'master' into multistream 2022-01-05 18:04:10 -05:00
Isaac Connor aefed4e174 Merge branch 'master' into multistream 2022-01-05 18:03:44 -05:00
Isaac Connor bc67493f91 Alter log level of restart events based on Importance setting 2022-01-05 16:49:20 -05:00
Isaac Connor bfac696fb7 return logger from loginit so that we can use it 2022-01-05 16:49:00 -05:00
Isaac Connor cce24ea427 Add RTSPServer and Importance fields 2022-01-05 16:48:46 -05:00
Isaac Connor 198ee73d0e Add alarm_cause to zm_packet. Clean up code dealing with decoding not being ready 2022-01-04 17:38:25 -05:00
Isaac Connor a59e33d8b0 remove unused last_section_mod 2022-01-03 19:14:27 -05:00
Isaac Connor b1353823cf clean up signal change code a bit, using new event notesetmap update function. So now when we lose signal, the event will close but it will have signal change :Lost added to it's notes. A new event will only be created if in RECORD/MOCORD. 2022-01-03 19:04:21 -05:00
Isaac Connor 7215756fed Introduce a method update the noteSetMap after event creation (addNote). 2022-01-03 19:03:04 -05:00
Isaac Connor 205ff6c033 apply fix to RtspServer 2022-01-02 19:25:52 -05:00
Isaac Connor e2a81cc2c5 make max_score an int to get rid of the casts. Move assignment of it above the event UPDATE sql so that it is immediately accurate. 2022-01-02 19:25:52 -05:00
Isaac Connor a76128e9c4 include monitor->Importance when logging failed camera connects 2022-01-01 18:56:13 -05:00
Isaac Connor e73765c5bf add basic readthedocs config 2022-01-01 17:55:28 -05:00
Isaac Connor 698fe14453 set zm_terminate instead of exit() so that all the cleanup code happens 2022-01-01 17:55:18 -05:00
Isaac Connor a250567e74 add sleeping when no viewers and in ondemand mode 2022-01-01 17:54:47 -05:00
Isaac Connor 8c8a9ca32a Rework the logic around waiting for capture to be in both single jpeg mode and streaming. 2022-01-01 17:54:20 -05:00
Isaac Connor fd489c2c8d Fix. Need to use system_clock 2022-01-01 17:53:45 -05:00
Isaac Connor a66adb6dcd fix SteadyClock vs Systemclock issues 2021-12-31 18:36:23 -05:00
Isaac Connor 6bd04de5f6 Merge branch 'master' into multistream 2021-12-31 17:53:36 -05:00
Isaac Connor 5933aa8a6f Use > 0.0 instead of boolean when testing maxfps 2021-12-28 15:34:31 -05:00
Isaac Connor e7a33a3dbe Add Importance to monitors view 2021-12-28 13:51:47 -05:00
Isaac Connor 46b95e28ec Fix commas 2021-12-28 13:51:36 -05:00
Isaac Connor 87962a3723 Invert Importance so that Normal is the auto-selected first value 2021-12-28 13:48:37 -05:00
Isaac Connor e81384bba4 Fix fail to build 2021-12-28 12:45:02 -05:00
Isaac Connor 0e148d809a cleanup logic and fix the zone names coming before the Motion: label 2021-12-28 12:33:23 -05:00
Isaac Connor f9f8764507 Change Event->Cause to a TEXT instead of varchar(32) because we now inclue Alarmed Zone name and could include other info as well.
Fixes #3403
2021-12-28 12:33:03 -05:00
Isaac Connor 82a5f3a059 set zm_terminate instead of exit() so that all the cleanup code happens 2021-12-26 15:19:13 -05:00
Isaac Connor bdcb7950cd Fix export from event view due to conflict with function name in skin.js 2021-12-26 11:51:32 -05:00
Isaac Connor 2aacbf790a handle warning due to not defined last_run 2021-12-26 11:51:32 -05:00
Isaac Connor 185dc4a50d Do a git pull instead of fetch so as to actually get the changes 2021-12-22 11:28:00 -05:00
Isaac Connor 96a450db3d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-12-22 11:27:39 -05:00
Isaac Connor 80166a1ab5 Fix preset labels not being populated and causing javascript errors when they are. 2021-12-22 11:25:46 -05:00
Isaac Connor 81048b6191 Reduce code 2021-12-17 13:29:30 -05:00
Isaac Connor 77793da70e If no max_fps set we don't care how long it takes to send frame 2021-12-17 13:29:30 -05:00
Isaac Connor edbe726e86 Implement semaphore retry. Make not getting the semaphore an error 2021-12-17 09:41:45 -05:00
Isaac Connor d128e3befc Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-12-16 17:02:33 -05:00
Isaac Connor 1bc0e1820e fix build on older c++ 2021-12-16 17:02:20 -05:00
Isaac Connor ee129ba2e3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-12-16 16:38:39 -05:00
Isaac Connor c081637036 Fixes to specifying width and height of image due to us jquery. Implement changeRate/MaxFPS. Cleanup use of auth_hash in JSON. 2021-12-16 16:38:15 -05:00
Isaac Connor 4dd454325c use options[maxfps] instead of always specifying 30fps. 2021-12-16 16:36:38 -05:00
Isaac Connor 30e4d72c1d Implement CMD_MAXFPS 2021-12-16 16:36:12 -05:00
Isaac Connor 7101a70774 Switch to steady_clock 2021-12-16 16:35:42 -05:00
Isaac Connor 60d2186ff4 Move from SystemTimePoint to SteadyTimePoint where possible. Implement MAXFPS command. Change the logic of calculating sleep time to make more sense. Get rid of frame_mod use in favour of calculating when then next frame should get sent and just waiting till then. 2021-12-16 16:35:20 -05:00