From 558331339447ef8385095f74445282f28c41a8ea Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Thu, 2 Jul 2020 08:44:03 -0500 Subject: [PATCH] Refactor creating multiple-path streams This way, we don't stream from the Reolink camera more than once, and simply create multiple Gstreamer mountpoints for the underlying factory. --- src/gst.rs | 6 +++-- src/main.rs | 67 +++++++++++++++++++++++------------------------------ 2 files changed, 33 insertions(+), 40 deletions(-) diff --git a/src/gst.rs b/src/gst.rs index 525ccfe..6c23509 100644 --- a/src/gst.rs +++ b/src/gst.rs @@ -32,7 +32,7 @@ impl RtspServer { } } - pub fn add_stream(&self, name: &str, stream_format: &StreamFormat) -> Result { + pub fn add_stream(&self, names: &[&str], stream_format: &StreamFormat) -> Result { let mounts = self .server .get_mount_points() @@ -77,7 +77,9 @@ impl RtspServer { let _ = tx.send(app_src); // Receiver may be dropped, don't panic if so }); - mounts.add_factory(&format!("/{}", name), &factory); + for name in names { + mounts.add_factory(&format!("/{}", name), &factory); + } Ok(maybe_app_src) } diff --git a/src/main.rs b/src/main.rs index ec7f9f1..d6cbc54 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,6 +9,7 @@ use neolink::gst::{MaybeAppSrc, RtspServer, StreamFormat}; use neolink::Never; use std::fs; use std::io::Write; +use std::sync::Arc; use std::time::Duration; use structopt::StructOpt; use validator::Validate; @@ -41,54 +42,44 @@ fn main() -> Result<(), Error> { ); let opt = Opt::from_args(); - let mut config: Config = toml::from_str(&fs::read_to_string(opt.config)?)?; + let config: Config = toml::from_str(&fs::read_to_string(opt.config)?)?; match config.validate() { Ok(_) => (), Err(e) => return Err(Error::ValidationError(e)), }; - // Setup auto sub streams, we do this by looping the cameras - // If the stream type is both we clone the config - // On one of the clones we set stream_source to "mainStream" on the other "subStream" - // We also change the mount name by appending "/mainStream" or "/subStream" - // On the original uncloned config we change the stream from "both" to "mainStream" and leave the mount name unchanged - let mut new_cam_configs = vec![]; - - for camera_config in &mut config.cameras { - if camera_config.stream == "both" { - let mut main_camera_config = camera_config.clone(); - let mut sub_camera_config = camera_config.clone(); - - camera_config.stream = "mainStream".to_string(); - - main_camera_config.stream = "mainStream".to_string(); - main_camera_config.name = format!("{}/{}", main_camera_config.name, main_camera_config.stream); - new_cam_configs.push(main_camera_config); - - sub_camera_config.stream = "subStream".to_string(); - sub_camera_config.name = format!("{}/{}", sub_camera_config.name, sub_camera_config.stream); - sub_camera_config.format = "h264".to_string(); // Assuming always H264 on subStream: TODO: Autodetect - new_cam_configs.push(sub_camera_config); - } - } - config.cameras.append(&mut new_cam_configs); - let rtsp = &RtspServer::new(); crossbeam::scope(|s| { for camera in config.cameras { - s.spawn(move |_| { - // TODO handle these errors - let cam_format :&str = &camera.format; - let stream_format = match cam_format { - "h264"|"H264" => StreamFormat::H264, - "h265"|"H265" => StreamFormat::H265, - custom_format @ _ => StreamFormat::Custom(custom_format.to_string()) - }; - let mut output = rtsp.add_stream(&camera.name, &stream_format).unwrap(); - camera_loop(&camera, &mut output) - }); + let stream_format = match &*camera.format { + "h264"|"H264" => StreamFormat::H264, + "h265"|"H265" => StreamFormat::H265, + 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. + let arc_cam = Arc::new(camera); + + // Set up each main and substream according to all the RTSP mount paths we support + if arc_cam.stream == "both" || arc_cam.stream == "mainStream" { + let paths = &[ + &arc_cam.name, + &*format!("{}/mainStream", arc_cam.name), + ]; + 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)); + } + 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 sub_camera = arc_cam.clone(); + s.spawn(move |_| camera_loop(&*sub_camera, &mut output)); + } } rtsp.run(&config.bind_addr, config.bind_port);