mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-01 12:44:48 -04:00
Code Issues Packages Projects Releases Wiki Activity
25,967 Commits 80 Branches 104 Tags
643fe97b2522c8141fb9624e8d05d53f4e8be329
Commit Graph

1362 Commits

Author SHA1 Message Date
Isaac Connor
643fe97b25 Deprecate zm_av_frame_alloc 2025-09-18 14:48:52 -04:00
Isaac Connor
15730be300 need to keep the greater of pre_event_count or alarm_frame_count in the packetqueue. 2025-09-06 10:07:13 -04:00
Isaac Connor
98c620d722 Don't default to MotionAlarm for ONVIF events, empty should allow for ALL events 2025-08-30 10:58:11 -04:00
Isaac Connor
5225e178bc Init output_codec to instead of 0 2025-08-20 16:35:57 -04:00
Isaac Connor
7bf2fb8fce Convert OutputCodec from int to varchar OutputCodecName. ffmpeg has different values for codec_id for different versions of ffmpeg. So just use the codec name instead. 2025-08-20 15:59:02 -04:00
Isaac Connor
7849b09311 Add go2rtc support to zmc 2025-06-26 14:55:05 -04:00
Isaac Connor
e6d11b5d88 Don't do reload when doing actionEnable/Disable. Log the change. 2025-06-13 09:33:02 -04:00
Isaac Connor
adb9bff244 Add EncoderHWACCelName and Device 2025-05-13 07:49:24 -04:00
Isaac Connor
9bdad92da2 Make clang on freebsd happy 2025-04-14 16:01:40 -04:00
Isaac Connor
3250355ff0 Add loading of RTSP2WebStream, fixing crash. 2025-02-26 20:43:35 -05:00
Isaac Connor
46e283a9a2 Merge branch 'patch-146634' of github.com:IgorA100/zoneminder into IgorA100-patch-146634 2025-02-26 12:37:38 -05:00
Isaac Connor
a6e7df168f Fix setKeyKeyframes, instead of || recording!=NONE, it should be && 2025-02-25 14:37:53 -05:00
Isaac Connor
52e68b06bf Try out code that automatically closes onvif state after either a timeout or valid poll that returns no motion events for cameras that don't send motion end events 2025-02-25 12:58:37 -05:00
IgorA100
bf156d24d4 Added support for selecting Secondary stream for RTSP2Web (zm_monitor.cpp) 
But I am not 100% sure that this is necessary!
 2025-02-22 20:19:45 +03:00
Isaac Connor
5fa5d8f79b Use UPSERT on Monitor_Status so that the record re-appears after it has been removed in on-demand cameras 2025-01-24 12:36:39 -05:00
Isaac Connor
4b34efa1cd DO like we do in 1.36 and only update the db monitor_status table every 10 seconds instead of every second. 2025-01-01 12:05:43 -05:00
Isaac Connor
96406e2044 Reset decoding_image_count when Paused so that when we resume, the Ready function waits for enough packets in queue. 2024-11-06 13:01:13 -05:00
Isaac Connor
fd9d014a82 Fix returning -1 to an unsigned int return value in getLastRead/WriteIndex 2024-10-29 10:35:08 -04:00
Isaac Connor
59f174847a Decode if we have never decoded before so that we have at least 1 image. Add more debugging to Pause 2024-10-28 15:49:56 -04:00
Isaac Connor
2efacc634c Add back in a Join on the analysis thread and decoder thread before clearing the packetqueue 2024-10-26 14:30:02 -04:00
Isaac Connor
5f5680ab5d Move stopping the packetqueue down below where we stop the threads 2024-10-26 13:33:48 -04:00
Isaac Connor
cff48df04a Attempt to log microsecond timestamp when capture 2024-10-25 14:08:29 -04:00
Isaac Connor
859f80fab4 MQTT Error should be a debug 2024-10-24 08:16:57 -04:00
Isaac Connor
282d736491 Add debug to tell when mqtt not compiled in, add include for zm_mqtt.h 2024-10-21 17:40:01 -04:00
Ben Dailey
326995d810 Working implementation from Alarms map so that rollover events contain the currently still enabled topics not just the last topic. 2024-10-03 10:33:55 -04:00
Ben Dailey
19014977e3 No functional change working as previoius via a function. 2024-10-02 10:30:23 -04:00
Isaac Connor
83f8f24167 Close FDs before exec so that we don't share STDIN/OUT/ERR with sub process. 2024-10-01 12:17:24 -04:00
Isaac Connor
0d922b1ecc Create mmap files with 660 instead 666. 2024-09-30 12:55:42 -04:00
Isaac Connor
331390ea20 Move Poller_Healthy and Trigger state into Amcrest_API and ONVIF modules. Add lastTopic and lastValue to onvif. Add values to event notes. Reverse logic for event ending to look for false, as the value could be other things like isMotion or IsPeople. 2024-09-18 12:27:26 -04:00
Isaac Connor
9b9f0159ad Move onvif event listener code to zm_monitor_onvif.cpp. In the Poll thread, if listener is not healthy, restart it. Fixes #4099 2024-09-16 13:40:00 -04:00
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