mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-24 06:27:07 -04:00
Code Issues Packages Projects Releases Wiki Activity
25,350 Commits 96 Branches 104 Tags
e3acc2a2d6725ce0ff1f68efda45be3fa8c17f03
Commit Graph

5918 Commits

Author SHA1 Message Date
Isaac Connor
69e3694854 Must use struct here as there is a name collision with flock() 2025-04-08 20:06:16 -04:00
Isaac Connor
220d7beb46 Individually set flock options, to simplifybsd support. 2025-04-08 10:21:38 -04:00
Isaac Connor
3f7c8f41c7 Fix && to & 2025-04-05 17:49:28 -04:00
Isaac Connor
8c75694823 Handle EOF and kill alarmed status if camera doesn't send end events 2025-03-15 20:14:38 -04:00
Isaac Connor
ff2696d041 It isn't really ok to send nullptr more than once and only try to receive packates if it succeeded. Some codecs crash if we aren't strict here 2025-03-15 20:12:42 -04:00
Isaac Connor
058913f241 Add av1_vaapi to list of encoders 2025-02-27 21:33:12 -05:00
Isaac Connor
5eee5b15ee Always define the mutex regardless of presence of soap 2025-02-27 09:07:57 -05:00
Isaac Connor
3250355ff0 Add loading of RTSP2WebStream, fixing crash. 2025-02-26 20:43:35 -05:00
Isaac Connor
d14b025150 Merge pull request #4232 from ZoneMinder/IgorA100-patch-146634 
Igor a100 patch 146634
 2025-02-26 14:31:15 -05:00
Isaac Connor
d4cb4a7c3b Merge branch 'onlyjob-master' 2025-02-26 13:00:53 -05:00
Isaac Connor
97f92800db Move locking out around all message parsing, hopefully fixing a race on isAlarmed. Further to #4195 2025-02-26 12:52:28 -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
284a8a7575 Add auth the second path. Fixes #4222 2025-02-26 12:02:30 -05:00
Yavor Doganov
9634d66307 Port to PCRE2 (Closes: #3384). 
Bug-Debian: https://bugs.debian.org/999919
Bug: https://github.com/ZoneMinder/zoneminder/issues/3384
 2025-02-26 21:04:32 +11:00
Isaac Connor
a0b8d2f6ca Maybe fix memleak on iterators 2025-02-25 14:39:46 -05:00
Isaac Connor
c8ca2ba0d6 Sync formatting of keyframe 2025-02-25 14:38:10 -05:00
Isaac Connor
a6e7df168f Fix setKeyKeyframes, instead of || recording!=NONE, it should be && 2025-02-25 14:37:53 -05:00
Isaac Connor
e06e14f75c iterator at the beginning is ok, make it a debug 2025-02-25 14:34:38 -05:00
Isaac Connor
4f3bad3e75 Add Options for TERM log out 2025-02-25 14:31:19 -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
Isaac Connor
1a44d7fdd1 fix debug when ONVIF fails 2025-02-25 12:58:23 -05:00
Isaac Connor
516c02cb8e Add ONVIF debuggin on failure 2025-02-25 12:58:09 -05:00
Isaac Connor
6e004dc2a5 Start roughing in the meaning of each SOAP err code 2025-02-25 12:57:52 -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
863ca21094 Fix 0=>1 for second channel 2025-02-13 15:08:19 -05:00
IgorA100
ffdbafda57 Audio stream support for rtsp2web (zm_monitor_rtsp2web.cpp) 2025-02-13 22:14:25 +03:00
Isaac Connor
50454f26cf Add second path to rtsp2web 2025-02-13 13:52:12 -05:00
Isaac Connor
66adcab8ea Merge pull request #4131 from SteveGilvarry/ffmpeg7-avcodec_close 
Removing avcodec_close, avcodec_free_context is replacement and been …
 2025-02-12 15:07:56 -05:00
Isaac Connor
6923cf8258 add debugging all 4 data andlinesize fields 2025-01-24 12:40:49 -05:00
Isaac Connor
f2e8741984 Choose altnernate video stream if it matches the specified resolution. Don't return packets that don't match our stream. discard unmatched streams. 2025-01-24 12:37:36 -05: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
f7232972de Fix clearing packets in queuePacket 2025-01-24 12:35:46 -05:00
Isaac Connor
8e5a9e462c Don't loop forever ignoring sigterm on initial connect 2025-01-16 17:29:10 -05:00
Isaac Connor
c3fa5bc15a Fix adding rotation when not needed. 2025-01-02 14:15:01 -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
36f45fdbc7 Wait until we get a successful shm connect before trying to set StartupTime. fixes crash 2024-12-12 12:21:32 -05:00
Isaac Connor
3fbb8bdaca Fix ffm=>video_out_stream 2024-12-10 15:45:39 -05:00
Isaac Connor
df0438d487 Fix lack of support for rotation in ffmpeg 5.1 onwards 2024-12-10 15:20:15 -05:00
Isaac Connor
9700ecf773 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-12-09 19:10:47 -05:00
Isaac Connor
0d34e4647a Log scale in debug about status command 2024-12-09 19:07:51 -05:00
Isaac Connor
d4b3edfca6 Fix debug string 2024-12-09 17:21:11 -05:00
Isaac Connor
14d6234e57 Make frame send time a debug 2024-12-09 12:26:51 -05:00
Isaac Connor
0755d56cba Must update iterator 2024-11-30 10:39:42 -05:00
Isaac Connor
66651824b5 Must move iterators for all deleted packets 2024-11-29 16:38:34 -05:00
Isaac Connor
697db024e1 Add more debug 2024-11-28 19:24:22 -05:00
Isaac Connor
52c41d166b When deleting packets in queuePacket if it is a keyframe, then delete everything from the beginning, so that we don't get a huge time gap between the first packet and the next 2024-11-28 17:01:13 -05:00
Isaac Connor
1da0fa0af3 Disable reorder queue if doing encoding 2024-11-23 13:53:25 -05:00
Isaac Connor
14f3f3bab1 Use > instead of >= in Ready for decoding count as we are ending up needing 1 from packet in queue. 2024-11-18 10:46:37 -05:00
Isaac Connor
292f0d9611 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-11-08 18:07:08 -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