Commit Graph

25015 Commits (master)

Author SHA1 Message Date
Isaac Connor 9a2706acaa Turn down debug levels 2024-11-04 08:05:12 -05:00
Isaac Connor 6a2b1b0341 Bump version to 1.37.65 for visibility for GHSA-qm8h-3xvf-m7j3 2024-10-31 13:52:38 -04:00
Isaac Connor 9e7d31841e Fix SQL Vulnerability. Fixes GHSA-qm8h-3xvf-m7j3 2024-10-31 13:51:50 -04:00
Isaac Connor 335900a727 Remove debugging of fps 2024-10-30 10:32:06 -04:00
Isaac Connor 1de8d76cae Remove debug of forceAlarmButton 2024-10-29 13:31:11 -04:00
Isaac Connor e616449af6 If AYSW is active, don't restart stream when window becomes visible again 2024-10-29 13:31:00 -04:00
Isaac Connor 6d1e273442 Fix definition of on_publish 2024-10-29 13:30:29 -04:00
Isaac Connor 8c32998e1c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-29 10:35:16 -04: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 9f536ccb22 GetLastWriteIndex returns -1 when it is equal to image_buffer_count 2024-10-28 16:06:57 -04:00
Isaac Connor 511bf0218c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-28 16:05:25 -04:00
Isaac Connor e7d4bafecf Produce better error log when panZoom entry is not found 2024-10-28 16:05:14 -04:00
Isaac Connor 6cc423bf7a Change logic for going to sleep to just have an image instead of using Ready() which looks for keyframe interval. 2024-10-28 15:51:44 -04:00
Isaac Connor 6fe9d9decb condense code in hasViewers 2024-10-28 15:50:46 -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 10b3619a66 clear probesize so ffmpeg doesn't complain abou it 2024-10-28 13:59:21 -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 f131f78d34 Add Join() function 2024-10-26 14:29:40 -04:00
Isaac Connor 94c2816841 Split out the default and initial_default concepts 2024-10-26 13:59:59 -04:00
Isaac Connor 1c0e03b813 Set the default for AnalysisFPSLimit to null so that we can empty it. Add an initial_default to use when creating a new monitor 2024-10-26 13:59:45 -04:00
Isaac Connor ad582e9033 Add Linked as a cause type to search for 2024-10-26 13:34:40 -04:00
Isaac Connor c25cc5d6e4 Include dts in the pack. Dump opkt not ipkt 2024-10-26 13:34:23 -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 0d03266455 Don't join in Stop methods. THe decode and analysis thread may never get woken up from packetqueue. Leave it for the destructor. 2024-10-26 13:33:26 -04:00
Isaac Connor c51c287c01 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-25 15:44:10 -04:00
Isaac Connor d9718235b9 Now that we are doing a better job of sizing/laying out the streams, we can set svg height to 100% so that it matches the ratio adjustment 2024-10-25 15:43:56 -04:00
Isaac Connor cff48df04a Attempt to log microsecond timestamp when capture 2024-10-25 14:08:29 -04:00
Isaac Connor 3e1c5573ec Don't warn about no locale set, that is normal 2024-10-25 11:02:49 -04:00
Isaac Connor f02121fcc2 Check for validity of locale. Handle fatal crash when setting datetiemformatter when an invalid locale is used. Fixes #4179 2024-10-25 10:41:56 -04:00
Isaac Connor bd6570d492 Add missing const 2024-10-24 18:29:23 -04:00
Isaac Connor 73cebb5a77 Improve debug message 2024-10-24 10:23:44 -04:00
Isaac Connor dadd9e24df when counting keyframe interval in clearPackets start at 0. Reset max_keyframe_interval when clearing packetqueue. This prevents errors in log when using ondemand capture 2024-10-24 10:23:29 -04:00
Isaac Connor 8496ce637a When every frame is a keyframe, make max_keyframe_interval=1 instead of 0 as 0 is the uninitialised state 2024-10-24 10:11:31 -04:00
Isaac Connor 8a7c7f20f6 Add Turkishtr 2024-10-24 10:00:32 -04:00
Isaac Connor 2e4cd94853 Fix eslint 2024-10-24 09:02:46 -04:00
Isaac Connor 550c08969f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-24 09:02:09 -04:00
Isaac Connor 859f80fab4 MQTT Error should be a debug 2024-10-24 08:16:57 -04:00
Isaac Connor bc5000ec06 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-23 19:06:37 -04:00
Isaac Connor 899269d83f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-23 18:47:50 -04:00
Isaac Connor 93953cef3a ALways re-apply the last update 2024-10-23 18:46:54 -04:00
Isaac Connor 1b08c6d00f Init last_fps_update in stream constructor 2024-10-22 18:32:31 -04:00
Isaac Connor 6f8ac29aa9 Make stream state inline so it all fits on one line 2024-10-22 18:31:36 -04:00
Isaac Connor e600472625 If using WallClockTimestamps, don't sweat a big jump in time. 2024-10-22 18:22:50 -04:00
Isaac Connor 02871576a5 Add fps to event status. Convert CmdTimer to Interval 2024-10-22 18:22:19 -04:00
Isaac Connor b6d01f45f4 Removed the deprecated delay code, and swapped some vars for consts 2024-10-22 16:18:54 -04:00
Isaac Connor ce1a1b87e9 Only try to send a command to enable analysis frames if we are streaming through zms. prevents an error being logged 2024-10-22 16:18:31 -04:00
Isaac Connor bbe366f05f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-22 10:15:08 -04:00
Isaac Connor 5ff4bee71f Gracefully handle if panzoom entry hasn't been created 2024-10-22 10:15:04 -04:00
Isaac Connor b273db24e1 Have to add MOSQUITTO_FOUND and MOSQUITTOPP_FOUDN to zoneminder-config.cmake in order for those defines to show up in config.h 2024-10-21 17:40:01 -04:00
Isaac Connor 6b32790a93 FIx up zm_mqtt.cpp to actually compile 2024-10-21 17:40:01 -04:00