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
24,885 Commits 80 Branches 104 Tags
73cebb5a77bc2dec594b10b092bcdae237e3754e
Commit Graph

24885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Isaac Connor
7ba5476f95 Correct MQTT library addition to ZM_BIN_LIBS 2024-10-21 17:40:01 -04:00
Isaac Connor
d111455c6a Append monitor id to MQTT name 2024-10-21 17:40:01 -04:00
Isaac Connor
d16481dede Remove generated files 2024-10-21 17:40:01 -04:00
Isaac Connor
a140754eb1 Janus_Use_RTSP_REstream is a checkbox, and so doesn't have length. 2024-10-21 17:40:01 -04:00
Isaac Connor
91e31d91bc Load #progressBar once 2024-10-21 17:40:01 -04:00
Isaac Connor
dea3b741c9 Require path to be a defined storage area. Use detaintPath to prevent Path Traversal. Fixes GHSA-g355-3rf6-f38v 2024-10-21 17:40:01 -04:00
Isaac Connor
a35bb17f8e Fix format string for response_code 2024-10-21 15:18:11 -04:00
Isaac Connor
890f14860d We need a lock around accessing the alarms map, because the onvif thread may clear an item while we are accessing it. 2024-10-21 15:18:05 -04:00
Isaac Connor
42914b63c0 Remove unneeded initialisations and group command processor code together 2024-10-20 18:04:12 -04:00
Isaac Connor
369c448dd3 TUrn x10 events into a debug 2024-10-20 09:58:56 -04:00
Isaac Connor
6e57c55db6 Move response_code down in scope, log curl_error value if not ok. 2024-10-18 18:39:08 -04:00
Isaac Connor
b50ef69629 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-16 18:45:51 -04:00
Isaac Connor
88692cf04f COde style, cleanups, remove STATE_TAPE 2024-10-16 18:45:10 -04:00
Isaac Connor
b236b48f1b Updates removing zma and fixing some of the perl module names 2024-10-16 11:42:55 -04:00
Isaac Connor
123c261e75 Fix eslint 2024-10-15 18:16:55 -04:00
Isaac Connor
c2fe3ce1e8 Fix eslint 2024-10-15 18:10:05 -04:00
Isaac Connor
038bf5c07e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-15 17:58:48 -04:00
Isaac Connor
65fd598bb7 Upgrade jwt-cpp to 0.7.0 2024-10-15 17:41:48 -04:00
Isaac Connor
75cd5e6166 Merge pull request #4175 from 0xB0D/master+gsoap-link-fix 
Fix libgsoap linking in src/CMakeLists.txt
 2024-10-13 12:01:29 -04:00
Bryan O'Donoghue
f43d048641 Fix libgsoap linking in src/CMakeLists.txt 
libgsoap supplies both libgsoap++.a and libgsoapssl++.a however an
application should link to one of those libraries not both.

An example from gsoap-2.8 samples:

With SSL:
/usr/bin/clang++ -DLINUX -g -O2   -o json-GitHub json_GitHub-json-GitHub.o json_GitHub-xml-rpc.o json_GitHub-json.o  json_GitHub-soapC.o ../../../gsoap/libgsoapssl++.a -lm -lssl -lcrypto -lz

Without SSL:
/usr/bin/clang++ -DLINUX -g -O2   -o json-currentTimeServer json-currentTimeServer.o xml-rpc.o json.o  soapC.o ../../../gsoap/libgsoap++.a -lm -lpthread

Right now src/CMakeLists.txt is try to link to both libgsoap++ and
libgsoapssl++.

/usr/bin/ld: /lib/libgsoapssl++.a(libgsoapssl___a-stdsoap2_ssl_cpp.o): in function `soap_query':
(.text+0x1880): multiple definition of `soap_query'; /lib/libgsoap++.a(libgsoap___a-stdsoap2_cpp.o):(.text+0x1890): first defined here
/usr/bin/ld: /lib/libgsoapssl++.a(libgsoapssl___a-stdsoap2_ssl_cpp.o): in function `soap_query_decode':
(.text+0x18a0): multiple definition of `soap_query_decode'; /lib/libgsoap++.a(libgsoap___a-stdsoap2_cpp.o):(.text+0x18b0): first defined here
/usr/bin/ld: /lib/libgsoapssl++.a(libgsoapssl___a-stdsoap2_ssl_cpp.o): in function `soap_query_key':
(.text+0x1a50): multiple definition of `soap_query_key'; /lib/libgsoap++.a(libgsoap___a-stdsoap2_cpp.o):(.text+0x1a60): first defined here

Change src/CMakeLists.txt so that

1. libgsoap++ is the default library to link
2. libgsoapssl++ is linked to instead if HAVE_OPENSSL is true

This means that if openssl is not detected libgsoap++ will be linked
otherwise libgsoapssl++ will be linked.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@nexus-software.ie>
 2024-10-13 14:12:55 +01:00
Isaac Connor
2be8cf7e63 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-10 13:56:23 -04:00
Isaac Connor
f1a72c909d Merge pull request #4171 from IgorA100/patch-438287 
Fix: incorrect placement of brackets (event.php)
 2024-10-10 13:52:33 -04:00
Isaac Connor
8e2bbd57c5 Merge pull request #4172 from IgorA100/patch-406680 
Fix: Specify 'mode'=>'mp4' for getStreamSrc() Otherwise video.js sometimes cannot determine that it is a file recording that is being played, and not a direct viewing. on Event page
 2024-10-10 13:51:00 -04:00
Isaac Connor
a745c61aef Merge pull request #4173 from IgorA100/patch-253092 
Fix: Increase z-index to 20 for buttons ".btn-zoom-in & .btn-zoom-out" (skin.css)
 2024-10-10 13:10:55 -04:00
Isaac Connor
0019857f11 Die with semi-useful log message if failed to create x10 2024-10-10 12:21:37 -04:00
IgorA100
e4fa3e9e12 Increase z-index to 20 for buttons ".btn-zoom-in & .btn-zoom-out" (skin.css) 
Otherwise, the ".block-button-center" block partially overlaps with other buttons.
 2024-10-10 16:24:14 +03:00
Isaac Connor
a0398dd2d7 Merge pull request #4170 from 0xB0D/master+alarms-fix 
Fix alarms() out of scope
 2024-10-08 15:33:28 -04:00
IgorA100
fb19016564 Fix: Specify 'mode'=>'mp4' for getStreamSrc() Otherwise video.js sometimes cannot determine that it is a file recording that is being played, and not a direct viewing. (event.php) 2024-10-08 19:58:14 +03:00
IgorA100
4d38ecd06e Fix: incorrect placement of brackets (event.php) 
Because of this it is not possible to switch to the "Codec = MGPEG" mode
The error appeared here: 2229e880b1
 2024-10-08 19:49:25 +03:00