Commit Graph

5828 Commits

Author SHA1 Message Date
Ben Dailey
19014977e3 No functional change working as previoius via a function. 2024-10-02 10:30:23 -04:00
Isaac Connor
bc1a7af1fc Add analysing to monitor status stream 2024-10-02 09:30:03 -04:00
Isaac Connor
0780032149 Add score to monitorstream status 2024-10-01 16:28:56 -04:00
Isaac Connor
f0305072ef Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-01 12:18:27 -04:00
Isaac Connor
aa2d1372d5 Update shm offsets in .h 2024-10-01 12:17:45 -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
5baf482e8f Merge pull request #4158 from BHMSD-bdailey/ONVIFTrackTopics
Add unordered map to track ONVIF topic and state
2024-10-01 10:26:59 -04:00
Ben Dailey
93f3a92996 Add alarms set cleanup and alarmed off when disconnected from ONVIF to prevent getting out of sync with camera. 2024-10-01 09:34:48 -04:00
Ben Dailey
5c31384063 Add Debug 2024-10-01 09:33:58 -04:00
Ben Dailey
f43268b184 Only add to alarms map and set last active if not already in map. 2024-10-01 09:31:33 -04:00
Isaac Connor
a57e5ecc24 Renumber the shm segments, put back reserved2 for better alignment 2024-09-30 13:47:48 -04:00
Isaac Connor
0d922b1ecc Create mmap files with 660 instead 666. 2024-09-30 12:55:42 -04:00
Ben Dailey
3915007af5 Return the last active topic and value 2024-09-30 12:41:34 -04:00
Ben Dailey
b664d7b085 Move debug for alarms count 2024-09-30 11:45:40 -04:00
Ben Dailey
b701c7bb2e Add unordered map to track ONVIF topic and state 2024-09-30 11:40:01 -04:00
Isaac Connor
33ede2f7d1 FIx floating point exception 2024-09-27 16:17:09 -04:00
Isaac Connor
c6e5ff43e7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-09-27 16:01:20 -04:00
Isaac Connor
3802ec17d3 Add test for 0 duration may fix floating point exceptions 2024-09-27 10:01:09 -04:00
Isaac Connor
e7d4fa334d Initialize lastPTS and only set lastAudioPTS if the stream is audio. 2024-09-25 10:53:47 -04:00
Isaac Connor
bf7920bad8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-09-24 19:30:47 -04:00
Isaac Connor
07d221569d Let higher ups deal with non-video non-audio packets. Might fix a memleak 2024-09-24 19:30:30 -04:00
Isaac Connor
37fef75eff Handle 0 frame_mod 2024-09-24 17:23:23 -04:00
Isaac Connor
4af6e6eee0 Do not output anything to stdout when logging is happening when the db is closed. 2024-09-23 11:43:55 -04:00
Isaac Connor
a28d88880f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-09-22 08:20:08 -04:00
Isaac Connor
312a15801e Using last_delta really doesn't work. Instead let's use remaining time/remaining frames. 2024-09-20 18:54:54 -04:00
Isaac Connor
3dd08cd213 Load duration from the db instead of calculating it from start and endtime. This gives us the decimal part as well. 2024-09-19 16:09:38 -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
7c8738e976 Correct log in debug statusment 2024-09-16 17:22:27 -04:00
Isaac Connor
e68fb77e4b Take frame_mod into account when calculating time to sleep. Fixes rate not really working. 2024-09-16 16:41:00 -04:00
Isaac Connor
1f1b5951f5 Handle when soap isn't defined 2024-09-16 13:46:35 -04:00
Isaac Connor
60adcd73e9 Add zm_monitor_onvif.cpp to CMakeLists.txt 2024-09-16 13:40:00 -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
0af441912f If an invalid port is specified, don't actually start the rtp threads. They don't get used in RTP/RTSP. Fixes #3759 2024-09-13 13:20:26 -04:00
Isaac Connor
e4543d8f33 CHange hasViewers to wait 10 seconds before returning false. 1 second seems to be too much. 2024-08-29 14:43:50 -04:00
Isaac Connor
1deccb8cf4 Instead of just exiting, set zm_terminate to true so we exit gracefully 2024-08-22 19:09:15 -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
05e91f852d Use wallclock timestamps when doing audio as well 2024-08-20 15:21:29 -04:00
Isaac Connor
6b44fda57f Don't need to delete packetqueue_it, as free_it does that. 2024-08-20 15:21:29 -04:00
Isaac Connor
d968e243ff Implement mode=single for events, so that we can efficiently just grab a single frame 2024-08-19 18:26:35 -04:00
Isaac Connor
251f66cb0b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-08-14 13:23:43 -04:00
Isaac Connor
5237641efe Fix calculation for when to send a keepalive image. Possible fixes #4101 2024-08-13 16:38:14 -04:00
Isaac Connor
fcf9d41c29 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-08-07 16:32:32 -04:00
Isaac Connor
c294ad09ff Must obtain lock in free_it 2024-08-07 15:22:35 -04:00
Isaac Connor
5d67c452b9 Don't pass zm_packet by reference 2024-08-07 12:26:24 -04:00
Isaac Connor
930a0e8e8f Fix simplified tail counting 2024-08-07 12:26:24 -04:00
Isaac Connor
2779839c55 Simplify code that counts the distance from analysis it to pktqueue.end 2024-08-07 12:26:24 -04:00
Isaac Connor
52d41fe3ce Sometimes the initial keyframe packet will have AV_NOPTS for pts and dts. When this happenes, set last_dts to -1 instead of 0, so that when the next packet comes in and sets the first_dts value, the resulting dts will be 0 which is > -1. 2024-08-02 13:24:39 -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
912b1818b7 Use get_packet_no_wait and a sleep so that if told to close we give up on getting a packet 2024-08-01 18:01:28 -04:00