ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,928 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

19928 Commits

Author SHA1 Message Date
Isaac Connor 23bfbcd6ce Merge branch 'master' into multistream 2022-01-26 10:13:20 -05:00
Isaac Connor 961256d2e7 terminate when zm_terminate is set. Do a countdown instead of countup. Sleeo for 10000 microseconds instead of 100. This restores the old value 2022-01-25 16:24:21 -05:00
Isaac Connor 17e01cb58f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-01-25 16:23:02 -05:00
Isaac Connor 4d90a816f8 Put a lock around jpeg writing. libjpeg is not thread safe 2022-01-25 16:22:33 -05:00
Isaac Connor 38da3b4d52 add some brackets to make logic more clear 2022-01-25 14:28:26 -05:00
Isaac Connor c8c09e560f Fix mTerminate not being initialised. 2022-01-25 14:27:39 -05:00
Isaac Connor cf82d767de Remove the decoding code, just populate the av_packet. This fixes rtsp decoding because we weren't copying the decoded frame to shm raw image. 2022-01-25 14:27:32 -05:00
Isaac Connor 26ae5052f4 Fix fail to get Sources in RTSP. the string msg although initially reserved to ZM_NETWORK_BUFSIZ, after use it's capacity is changed whatever it's contents are. So need to re-reserve. 2022-01-25 11:55:21 -05:00
Isaac Connor 3cc243b9a8 Don't freshing config when doing update. That is it's own command 2022-01-24 09:24:16 -05:00
Isaac Connor 146ea4822d Bump the db queue limit to 30 before we warn. I only have 1 server that gets over 20 and it is still ok. 2022-01-24 09:24:16 -05:00
Isaac Connor f10d0fd3f5
Merge pull request #3413 from jp-bennett/master 
Adds janus updates
 2022-01-23 12:35:42 -05:00
Jonathan Bennett 5485c04bc6 Rework of the Janus polling loop 2022-01-23 01:07:48 -06:00
Jonathan Bennett d110987935 Fix indentation for ESLint 2022-01-22 13:37:44 -06:00
Jonathan Bennett abbd27d1cb Remove hard-coded config Vars 2022-01-22 13:31:47 -06:00
Jonathan Bennett 07c5b23aa6 Adds Janus streaming checks to polling thread 2022-01-22 12:49:08 -06:00
Isaac Connor 9443aaa2d8 Do state changes when in RECORD mode as well as it doesn't do motion detection Fixes #3411 2022-01-22 13:33:39 -05:00
Jonathan Bennett 8125aa633b
Merge branch 'ZoneMinder:master' into master 2022-01-22 12:20:13 -06:00
Isaac Connor 90f75dae93 Make config entries const 2022-01-22 12:33:48 -05:00
Isaac Connor 47aa1d1913 Bump version to 1.37.10 2022-01-22 12:31:56 -05:00
Isaac Connor 3a0b88c013 Don't make private config entries available to js land. 2022-01-22 12:31:36 -05:00
Isaac Connor ce2d605b3d load Private as well as Name,Value from Config 2022-01-22 12:31:15 -05:00
Isaac Connor 35efb111ac Add Private to Config 2022-01-22 12:30:59 -05:00
Isaac Connor 45db266ede Put full config available to javascript 2022-01-22 12:07:18 -05:00
Isaac Connor 4910ec752f Merge branch 'master' into multistream 2022-01-22 11:52:19 -05:00
Jonathan Bennett 2e9bda1af1 Add firefox specific workaround for Janus streaming 2022-01-21 23:21:41 -06:00
Jonathan Bennett 52e48c02b6 Add janus_path and janus_secret, allowing for more secure and flexible Janus installs 2022-01-21 22:23:41 -06:00
Isaac Connor 4eb4e0eb18 ignore ajaxQueue.js 2022-01-20 12:02:17 -05:00
Isaac Connor 5ce701f5cb Use Monitor->getStatusHTML to generate status html 2022-01-20 11:53:44 -05:00
Isaac Connor 91d6ff2029 Use Monitor->getStatusHTML to generate status html 2022-01-20 11:53:35 -05:00
Isaac Connor 57bb91e105 add connKey to monitorData 2022-01-20 11:53:05 -05:00
Isaac Connor 9c3509a620 put an mid in imageFeed id so we can use MOnitorStream.js. Use Monitor->getStatusHTML to generate status html 2022-01-20 11:52:54 -05:00
Isaac Connor e73659843a Rework to use MonitorStream.js 2022-01-20 11:52:01 -05:00
Isaac Connor 7748616992 If rate > 1600, limit it to 1600 to prevent logged errors 2022-01-20 11:51:08 -05:00
Isaac Connor 24a9dcbf47 If rate > 1600, limit it to 1600 to prevent logged errors 2022-01-20 11:50:53 -05:00
Isaac Connor 97f2c0a02b Load ajaxQueue 2022-01-20 11:50:25 -05:00
Isaac Connor 2da9c20c08 Add ajaxQueue 2022-01-20 11:49:59 -05:00
Isaac Connor 22b6337752 Merge code from watch.js. Add an ajaxQueue. Link up buttons from UI 2022-01-20 11:47:28 -05:00
Isaac Connor 4bf55b1af1 Use net zm_setcookie 2022-01-20 09:48:09 -05:00
Isaac Connor 3cd6fbdc12 Use net zm_setcookie 2022-01-20 09:48:02 -05:00
Isaac Connor 9395b7e47c Use net zm_setcookie 2022-01-20 09:47:53 -05:00
Isaac Connor a57206ef54 Implement getMonitorStateHTML to synchronize it between montage and live view, cycle etc. Reuseable code. Also the structure is required by MonitorStream.js 2022-01-20 09:47:36 -05:00
Isaac Connor db866fa668 Implement zm_setcookie to simplify setting cookies, set samesite, deal with older php etc. Use it. 2022-01-20 09:46:38 -05:00
Isaac Connor dec440ead1 Unset holdbuffer so that when we connect, we reset the shm buffer pointer. cleanup initializers in Image 2022-01-19 15:01:37 -05:00
Isaac Connor 05043a37b1 include image index in debug 2022-01-19 12:27:16 -05:00
Isaac Connor 062cde54a0 Bump version for janus audio 2022-01-19 10:45:38 -05:00
Isaac Connor ebcb3abf2e image_count is only relevant to capture. decode and analysis should use packet->image_index for indexing into image_buffer, etc. 2022-01-19 09:33:33 -05:00
Isaac Connor e6edf5b7db
Merge pull request #3410 from jp-bennett/master 
Adds janus_enable_audio, a switch to try to enable audio in live stre…
 2022-01-19 09:32:22 -05:00
Jonathan Bennett 04cfe372f8 Wrap public access function in Gsoap ifdef to remove build warning 2022-01-19 00:56:36 -06:00
Jonathan Bennett fb832e7d1b Adds janus_enable_audio, a switch to try to enable audio in live stream viewing. 2022-01-19 00:14:52 -06:00
Isaac Connor d00aaa11e9 default JanusEnabled to 0 so that we can turn it off 2022-01-18 23:02:26 -05:00