Commit Graph

19955 Commits

Author SHA1 Message Date
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
Isaac Connor 388735e942 Fix relating auth_hash causing repeated reloads. If https, then assume a reverse proxy setup to janus. If video feed is not an img, log it and return 2022-01-18 23:02:26 -05:00
Isaac Connor 13ee39b1e9 Log errors talking to Janus. Log if janus is turned on but not compiled in 2022-01-18 23:02:26 -05:00
Isaac Connor d2d9721c4e spacing, remove redundant debug 2022-01-18 23:02:26 -05:00
Isaac Connor 3241fa59c5 Don't redirect if there was an error so that we display it 2022-01-18 23:02:26 -05:00
Isaac Connor ec1f0d87af fix HEAD left behind 2022-01-18 20:20:38 -05:00
Isaac Connor 3835087c9d Merge branch 'master' into multistream 2022-01-18 20:16:08 -05:00
Isaac Connor 0c055edb5e I think in all my changes I got rid of the code that opens events on Alarm. 2022-01-18 12:20:19 -05:00
Isaac Connor 90492d332c Put back to brand 3.0 of upstream 2022-01-18 10:39:24 -05:00
Isaac Connor 24c2efeb00 fix eslint 2022-01-17 16:19:27 -05:00
Isaac Connor eab29babea
Merge pull request #3409 from jp-bennett/master
Refactor Montage view js -- Janus in MonitorStream
2022-01-17 15:14:43 -05:00
Isaac Connor 32a5dcbda9 ignore janus for eslint 2022-01-17 14:52:43 -05:00
Isaac Connor 4374a6e70e Bump versions of eslint to latest 2022-01-17 14:35:59 -05:00
Isaac Connor 08b3277aa8 bump version for janus 2022-01-17 14:09:27 -05:00
Jonathan Bennett 5026008482 Changes due to janus packaging 2022-01-16 19:55:53 -06:00
Jonathan Bennett 688f505f28 Adds better error handling, changes expected location of janus.js 2022-01-16 19:44:52 -06:00
Jonathan Bennett f27f7e9d27
Merge branch 'ZoneMinder:master' into master 2022-01-16 12:25:58 -06:00
Isaac Connor 5f17cb6e9a Debug the size returned as compared to the file size 2022-01-15 17:19:35 -05:00
Isaac Connor 1891002c65 Remove Freenode from the badges. 2022-01-15 17:19:35 -05:00
Isaac Connor 4cd085e085 Bump eslint to ECMA2017 2022-01-15 17:19:35 -05:00
Jonathan Bennett 59056b4103 Refactor Montage view js -- Janus in MonitorStream 2022-01-15 01:33:17 -06:00
Isaac Connor 8d757d37a6 fix eslint 2022-01-14 16:43:59 -05:00
Isaac Connor 1ae61afd47
Merge pull request #3408 from jp-bennett/janus
Adds Janus h264 streaming
2022-01-14 16:34:19 -05:00
Isaac Connor aba387f202 Fix !== which should be >= 2022-01-14 16:31:52 -05:00