From 94be9e603c0a6dfd09a5a03bf13934ad18a3c72c Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Fri, 3 Jul 2020 17:12:58 -0500 Subject: [PATCH] Fix stream paths --- src/main.rs | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main.rs b/src/main.rs index d6cbc54..66c44d2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -59,6 +59,12 @@ fn main() -> Result<(), Error> { custom_format @ _ => StreamFormat::Custom(custom_format.to_string()) }; + // The substream always seems to be H264, even on B800 cameras + let substream_format = match &*camera.format { + "h264"|"H264"|"h265"|"H265" => StreamFormat::H264, + custom_format @ _ => StreamFormat::Custom(custom_format.to_string()) + }; + // Let subthreads share the camera object; in principle I think they could share // the object as it sits in the config.cameras block, but I have not figured out the // syntax for that. @@ -72,13 +78,13 @@ fn main() -> Result<(), Error> { ]; let mut output = rtsp.add_stream(paths, &stream_format).unwrap(); let main_camera = arc_cam.clone(); - s.spawn(move |_| camera_loop(&*main_camera, &mut output)); + s.spawn(move |_| camera_loop(&*main_camera, "mainStream", &mut output)); } if arc_cam.stream == "both" || arc_cam.stream == "subStream" { let paths = &[&*format!("{}/subStream", arc_cam.name)]; - let mut output = rtsp.add_stream(paths, &stream_format).unwrap(); + let mut output = rtsp.add_stream(paths, &substream_format).unwrap(); let sub_camera = arc_cam.clone(); - s.spawn(move |_| camera_loop(&*sub_camera, &mut output)); + s.spawn(move |_| camera_loop(&*sub_camera, "subStream", &mut output)); } } @@ -89,13 +95,13 @@ fn main() -> Result<(), Error> { Ok(()) } -fn camera_loop(camera_config: &CameraConfig, output: &mut MaybeAppSrc) -> Result { +fn camera_loop(camera_config: &CameraConfig, stream_name: &str, output: &mut MaybeAppSrc) -> Result { let min_backoff = Duration::from_secs(1); let max_backoff = Duration::from_secs(15); let mut current_backoff = min_backoff; loop { - let cam_err = camera_main(camera_config, output).unwrap_err(); + let cam_err = camera_main(camera_config, stream_name, output).unwrap_err(); output.on_stream_error(); // Authentication failures are permanent; we retry everything else if cam_err.connected { @@ -127,7 +133,7 @@ struct CameraErr { err: neolink::Error, } -fn camera_main(camera_config: &CameraConfig, output: &mut dyn Write) -> Result { +fn camera_main(camera_config: &CameraConfig, stream_name: &str, output: &mut dyn Write) -> Result { let mut connected = false; (|| { let mut camera = BcCamera::new_with_addr(camera_config.camera_addr)?; @@ -147,9 +153,9 @@ fn camera_main(camera_config: &CameraConfig, output: &mut dyn Write) -> Result