mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-24 23:38:29 -04:00
Code Issues Packages Projects Releases Wiki Activity
24,610 Commits 107 Branches 109 Tags
b66e04024fc2d877911ef2c4f516fe97b9817667
Commit Graph
1332 Commits
Author SHA1 Message Date
Isaac Connor c1ffd32f1e Fix cameras not appearing online because we aren't ever updating the Monitor_Status record 2024-08-21 18:08:31 -04:00
Isaac Connor 5379f2273b Only use fps_report_interval for logging and MQTT. Update the db entry every 10 seconds 2024-08-20 16:10:17 -04:00
Isaac Connor 9aa5b65ffa Use packetqueue.unlock so that we wakeup event threads waiting on the packet. 2024-08-02 10:37:54 -04:00
Isaac Connor 74f9deebfe Free starting_packet_lock earlier so theoretically event can grab it sooner 2024-07-30 13:14:32 -04:00
Isaac Connor 435bee1a84 Log actual return code value for ONVIF PullPointSubscription 2024-07-22 13:39:30 -04:00
Isaac Connor 53122eba85 Add WallClockTImestamps to actual SQL load 2024-07-06 17:51:38 -04:00
Isaac Connor cbe0c7c9e2 Add loading wallclock setting from db and provide accessor function 2024-07-06 17:20:31 -04:00
Isaac Connor f4e30054d7 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2024-06-27 16:02:09 -04:00
Isaac Connor d98d3d3637 convert image_size to size_t and use correct formatters. Fixes warnings on 32bit 2024-06-27 16:00:51 -04:00
Isaac Connor e4ce6b133e Turn warning into debug fixes logging when using vnc monitor 2024-06-26 14:22:36 -04:00
Isaac Connor 3b084bebb8 Fix recording when Decoding=None by setting packet->decoded in capture 2024-06-23 11:22:10 -04:00
Isaac Connor 0f470efa27 FIx Warning 2024-06-23 10:56:19 -04:00
Isaac Connor 0c247a869e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-06-23 10:55:45 -04:00
Isaac Connor 505727e493 Improve ONVIF error message 2024-06-23 10:55:42 -04:00
Isaac Connor 9e41dbbb47 When not decoding, still mark the packet as decoded so that recording will work. 2024-06-23 10:45:14 -04:00
Isaac Connor 9ae87d26bd Reset last_capture_image_count in connect so that we don't get negative fps reports and possible floating point exceptions 2024-06-21 14:04:19 -04:00
Isaac Connor 7d99f1e033 Do not null packet->out_frame, it might be in use. The packet manages the frame 2024-06-20 16:43:40 -04:00
Isaac Connor 402faeb9c5 Mark audio packets as decoded 2024-06-17 13:55:35 -04:00
Isaac Connor 742f36c58c Redo the event thread. Instead of analysis adding packets to an event specific queue, just pass in the iterator and let the event thread do it's own locking. This allows us to free ram in packet in the event, and not segfault. 2024-06-14 18:34:33 -04:00
Isaac Connor d1d7dd77cc Use a while instead of a pointless for 2024-05-24 16:03:36 -04:00
Isaac Connor d3f4b63274 Use better format specifiers 2024-05-24 16:03:03 -04:00
Isaac Connor 937cc80b65 Free analysis image regardless of recording mode 2024-05-22 09:15:57 -04:00
Isaac Connor e6f9dbae2e move image_count to shared mem. Use it in monitorstream to detect when last_write_time % buffer_count hasn't changed, but there is in fact a new image. 2024-05-21 14:53:52 -04:00
Isaac Connor 0048a6bc99 Use quick_exit instead of exit to fix hanging processes when event start/top commands have an error. 2024-05-12 12:07:55 -04:00
Aaron Kling c4683d90a9 Format code using astyle google format 
Commands used:
astyle --style=google --indent=spaces=2 --keep-one-line-blocks src/*.cpp
astyle --style=google --indent=spaces=2 --keep-one-line-blocks src/*.h
 2024-03-26 13:43:58 -05:00
Isaac Connor 8e87fc2809 Add default values for ONVIF_EVENTS_PATH and ONVIF_Alarm_Text 2024-03-22 09:31:55 -04:00
Isaac Connor a184f3adeb Always restart the analysis thread. It is needed. Also free convert_context in Pause 2024-03-19 14:55:21 -04:00
Isaac Connor 92e6a9b5d0 Rough in startup_delay function 2024-03-18 12:54:30 -04:00
Isaac Connor 56fcd8472e Fix motion events having cause continuous. Fixes #3858 2024-03-14 11:54:15 -04:00
Isaac Connor 07153f6773 Don't set snap score when skipping frames. Don't exit alarms when we havn't done motion detection. As a result, alarm_frame_count shouldn't cause immediate alarm anymore and because we aren't clearing prealarm frames, event recording should start 2024-03-12 21:22:58 -04:00
Isaac Connor 3bab238ee4 Limit score to 255 2024-03-04 17:54:25 -05:00
Isaac Connor fb37cd3c30 Remove refs to event from Info because there might not be an event. Fix crash. 2024-03-04 17:31:06 -05:00
Isaac Connor 04017b20f1 Make recording=onmotion respect post_event_count 2024-02-29 09:02:07 -05:00
Isaac Connor e78c873944 Remove TAPE state. 2024-02-26 14:36:27 -05:00
Server 58d8cf0adf Makes the "Events" part of the ONVIF URL configurable 
as required per some ONVIF version 21.06 cameras
by default sets the Events Path equals to "/Events"
to maintain functionality
 2024-02-24 11:05:08 -06:00
Isaac Connor e1a141ed7d Remove event_start_mode, not going to be used 2024-02-23 16:56:55 -05:00
Isaac Connor 06134c387b Remove event_start_mode, not going to be used 2024-02-23 16:52:21 -05:00
Isaac Connor 920568c704 Use switch instead of ifs and add CLOSE_DURATION as valid value 2024-02-23 16:50:44 -05:00
Isaac Connor 824d6ec032 Remove EventStartMode stuff 2024-02-22 16:58:03 -05:00
Isaac Connor eeb8856157 Ad EventStartMode and EventCLoseMode to monitor 2024-02-22 10:46:36 -05:00
Isaac Connor 0d98b2523d Split recording=ONMOTION and recording=ALWAYS logic out explicitly, even though it leads to redundant code, it should be easier to debug. 2024-02-22 10:39:38 -05:00
Isaac Connor ae2dc039ac Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-02-22 10:02:46 -05:00
Isaac Connor 364d0c438e Split the if so that we get better debug output 2024-02-22 09:52:17 -05:00
BHMSD-bdailey 025fc939a9 Update debug to make it unique 2024-02-22 07:49:49 -05:00
BHMSD-bdailey ebee72bf65 Prevent events from exceeding the section_length even if we are still in alarm 2024-02-21 17:10:18 -05:00
Isaac Connor 15e4a7ac65 Move setting of last_signal up to where it is used for clarity 2024-02-21 12:09:24 -05:00
BHMSD-bdailey 7e6efde1a9 Simple typo and consistency fixes. 2024-02-21 10:47:53 -05:00
Isaac Connor 602959adce Fix issue with packet have score != -1. We don't set snap->score until after doing motion detection because we give up if we are waiting for decoding. We now always do state transitions regardless of whether we did motion detection. 2024-02-15 09:33:23 -05:00
Isaac Connor 29d70ab79b Revert "Revert "Merge score and snap->score. The effect is to treat all alarms as alarmed frames regardless of source. Should fix linked monitors ending the event early"" 
This reverts commit efe5c02223.
 2024-02-15 09:00:31 -05:00
Isaac Connor efe5c02223 Revert "Merge score and snap->score. The effect is to treat all alarms as alarmed frames regardless of source. Should fix linked monitors ending the event early" 
This reverts commit 0e1cf9beda.
 2024-02-15 08:13:45 -05:00