Aaron Kling
c4683d90a9
Format code using astyle google format
...
Commands used:
astyle --style=google --indent=spaces=2 --keep-one-line-blocks src/*.cpp
astyle --style=google --indent=spaces=2 --keep-one-line-blocks src/*.h
2024-03-26 13:43:58 -05:00
Isaac Connor
5a497a7d25
Add JANUS to logs relating to JANUS to ease debugging
2023-07-24 17:45:36 -04:00
Isaac Connor
f2009e4f38
Remove deprecated reference to MonitorIds from janus
2023-05-31 16:35:57 -04:00
baudneo
8750e0e333
Add Janus RTSP session timeout to C ⚗️
...
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com >
2023-01-09 17:57:26 -07:00
Jonathan Bennett
9cb21dce22
Uses the master Janus secret as the mountpoint secret, detects and restarts mounts if PIN is stale
2022-09-24 16:05:52 -05:00
Isaac Connor
abc5ea26d8
Merge branch 'master' into add_janus_rtsp_user
2022-09-18 12:44:25 -04:00
Isaac Connor
bdf5b5d202
Use empty() instead of length() which is faster. Add rtsp path to debug
2022-09-18 12:36:29 -04:00
Isaac Connor
67a7c0721a
Fix bad merge reverts. Put back code that take username and password from fields in monitor instead of parsing from rtsp path
2022-09-17 18:58:50 -04:00
Isaac Connor
b7143a3c84
Add a check for auth timeout and re-adding with a new auth token.
2022-09-14 20:29:33 -04:00
Isaac Connor
419a44f8ed
Merge branch 'iiot'
2022-09-13 18:23:44 -04:00
Isaac Connor
d079439005
Merge branch 'reports' of http://github.com/ConnorTechnology/zoneminder into reports
2022-09-12 19:40:27 +02:00
Isaac Connor
18fb1777ec
If in a multi-server env, load the hostname instead of localhost for the server for this camera when using zm_rtsp_server.
2022-09-12 11:54:56 -04:00
Isaac Connor
d2c461bcc9
When using RTSP_Server restream, need to auth as a ZM user. So load user and create an auth token.
2022-09-12 10:34:26 -04:00
Jonathan Bennett
c35bbc8c30
Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it
2022-09-07 15:49:47 -05:00
Jonathan Bennett
71c5339c2b
Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues
2022-08-19 13:33:22 -04:00
parvit (Vittorio Parrella)
3642abd155
typo
2022-08-15 14:35:16 -04:00
parvit (Vittorio Parrella)
408b42edd4
correct regex escaping
2022-08-15 14:30:48 -04:00
parvit (Vittorio Parrella)
603d10a072
janus password integration
2022-08-15 12:55:04 -04:00
Jonathan Bennett
d41792ae00
Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues
2022-08-09 00:54:41 -05:00
Isaac Connor
33943acbc4
Code style, spacing. Move check for trailing slash into the if specified janus_path part
2022-07-28 16:27:28 -04:00
Isaac Connor
4ab8166665
Init Janus_Healthy although it is never used
2022-07-14 10:29:10 -04:00
Jonathan Bennett
ad3d593b1f
Change case of rtsp:// URI to match RFC
...
At least one camera fails when receiving a DESCRIBE with the rtsp:// URI capitalized. The RFC uses lowercase, so this should be the more universal option.
2022-04-25 13:36:43 -05:00
Isaac Connor
b103072b7e
Cleanup code a bit moving variable declarations around to where they are used and removing duplicated curl free.
2022-03-10 12:24:00 -05:00
Isaac Connor
5dc4e5ddb4
Fix compile warning. Rename variables to be more descriptive and remove unused ones
2022-03-10 12:09:02 -05:00
Jonathan Bennett
9f4df40ac5
Add rtsp_quirk to Janus mountpoints.
...
Workaround for Vivotek and possibly other cameras that use nonstandard RTSP URIs,
2022-03-04 20:40:56 -06:00
Jonathan Bennett
dde3884084
Moves Janus and Amcrest into their own nested classes
2022-02-03 16:31:07 -06:00
