mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-30 19:52:31 -04:00
Code Issues Packages Projects Releases Wiki Activity
23,361 Commits 80 Branches 104 Tags
824d6ec032add04fa7ce7c4a8367d569cf961762
Commit Graph

1294 Commits

Author SHA1 Message Date
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
Isaac Connor
0e1cf9beda 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 2024-02-14 17:22:26 -05:00
Server
0ff48f631e Implements an option to disable soap_wsa code that doesn't work 
with some chinese cameras, more common to Latam zone
 2024-02-12 19:22:01 -06:00
ovargasp
5d5210b116 Changes to zm_monitor code to enable/disable soap_wsa support 
for chinnese cameras that doesn't have it implemented
 2024-02-11 07:42:58 -06:00
Isaac Connor
a64b24687c Add warnings when event_close_mode is weird. Fix monitor always being in close_mode=idle. Still do state changes even if packet is not video. Do not set state=ALARM when triggered, let the state machine do that. 2024-02-07 15:56:24 -05:00
Isaac Connor
22a2846218 Can't set alarm when triggering. Must be done by the state machine 2024-02-07 15:56:24 -05:00
Isaac Connor
593f6f1601 Add some more debugging to track down idle events not closing on alarm 2024-02-07 15:56:24 -05:00
Isaac Connor
f92115b4fe Spacing 2024-02-07 15:56:23 -05:00
Isaac Connor
e159948d62 Handle state==TAPE when CLOSE_EVENT_MODE=IDLE 2024-02-05 17:39:05 -05:00
Isaac Connor
c9c2898912 Fix some spacing 2024-02-05 16:11:22 -05:00
Isaac Connor
5285c6e716 cpplint spacing changes. The real change is in Analysis we move the Ready check to only affect motion detection. This hopefully fixes the massive memory leak when Decoding=OnDemand 2024-01-30 09:31:28 -05:00
Isaac Connor
7493230e03 Better debugging, of unsupported codec types and monitor link results 2024-01-27 18:32:22 -05:00
Isaac Connor
219d0b6eba When recording = onmotion, end event after post alarm count instead of section_length. 2024-01-24 13:00:31 -05:00
Isaac Connor
403c63af9b Use Duration instead of timestamp % section_length. Shorter code and actually works. Fixes #3806 2024-01-23 16:39:43 -05:00
Isaac Connor
f1aa08971f group->Name needs a c_str 2024-01-23 16:12:56 -05:00
Isaac Connor
d81b98da25 Set cause = LINKED_CAUSE regardless of whether we are in an event, as we may be ending an idle event to start a new one. Use MonitorLinkExpression.result to get score from the expression instead of just using 20. Imrpove logic around close events to prevent them from lasting too long 2024-01-22 14:25:57 -05:00
Isaac Connor
343d2294d4 Take post_event_frame count into consideration when closing events 2024-01-19 12:26:05 -05:00
Isaac Connor
a0ecbdf0bf Rework state machine, separating the state machine from the code to start/stop event recording. Doing section_length < min_section_length at monitor load time instead of constantly during analysis. 2024-01-17 17:09:42 -05:00
Isaac Connor
08aefd881a Add decoding_image_count, use it in Ready() instead of image_count. Fix hanging processes due to event start/end command failing because it waits writing to db which isn't really open. Stop analysis thread in Pause. 2024-01-16 16:47:14 -05:00
Isaac Connor
fba728d406 Must close events before closing camera because we use it's inputs_streams in videostore. 2024-01-16 09:48:38 -05:00
Isaac Connor
fe9abb96a1 Revert "Remove unknown as a state, as string lookup has to start at 0 and this breaks api." 
This reverts commit e0a90319e7.
 2024-01-11 17:17:25 -05:00
Isaac Connor
992cbc137f When not recording, fix never going back to idle state 2024-01-11 17:13:09 -05:00
Isaac Connor
e0a90319e7 Remove unknown as a state, as string lookup has to start at 0 and this breaks api. 2024-01-11 17:10:48 -05:00
Isaac Connor
5fc785aca5 Fix crash when a monitor is in query mode and hence doesn't have a camera to close. Fixes #3794 2023-12-09 16:51:21 -05:00
Isaac Connor
afcc07facd Rough in a Uri class, use it to populate onvif_url if not filled in 2023-12-07 13:31:24 -05:00
Isaac Connor
6dc0e88988 Turn common Errors into Info beacuse they happen all the time when reloading a monitor 2023-12-06 14:40:29 -05:00
Isaac Connor
d67fb2b175 Handle RenewRequest not being supported 2023-12-06 13:23:06 -05:00
Isaac Connor
c2946f203e Reduce debug logging. Clean up Play/Pause a bit. 2023-12-06 12:25:12 -05:00
Isaac Connor
a7e56a44a7 If the response to Renew is actionNotSupported, then just assume that we can be healthy. Apparenlty Dahua cameras don't support Renew. 2023-12-06 09:52:27 -05:00
Isaac Connor
1253a5fffe Add streams to RTSP2Web and Janus earlier, in connect so that Capturing=ONDEMAND streams are streamable. Add Pause/Play functions to Play/Pause capturing. 2023-12-06 09:41:45 -05:00
Isaac Connor
c1ae4336a7 Change Got Good Repsonse fro ONVIF to a debug 2023-11-23 16:06:32 -05:00
Isaac Connor
72855fb501 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-11-07 10:20:07 -05:00
Isaac Connor
d908c9185f Set heartbeat while connecting so that it gets set before we do all the soap/onvif stuff. Prevents zmwatch restarting zmc because of 0 heartbeat 2023-11-07 09:15:10 -05:00
Isaac Connor
a52dc04d2e Add debug in Ready(). Reset image_count in Reload so that Ready() works after a reload. 2023-11-06 12:49:44 -05:00
Isaac Connor
58204928c2 Increase debug level for ONVIF 2023-11-06 11:27:03 -05:00
Isaac Connor
f65761a31d Spacing, add more debug to ::Analyze 2023-10-26 16:19:24 -04:00
Isaac Connor
581a6aa6b8 Put debug lines where they should go to reduce confusing excess logging 2023-10-24 13:43:10 -04:00
Isaac Connor
7bd518b23d Add debug for not clearing packets 2023-10-23 14:22:51 -04:00
Isaac Connor
63bf00c065 Clean up whitespace, turn off verbose in curl 2023-10-20 10:52:14 -04:00