diff --git a/crates/core/src/bc_protocol/stream.rs b/crates/core/src/bc_protocol/stream.rs index ba4aebd..0486b80 100644 --- a/crates/core/src/bc_protocol/stream.rs +++ b/crates/core/src/bc_protocol/stream.rs @@ -45,6 +45,12 @@ impl BcCamera { _ => 0, }; + let handle = match stream_name { + "mainStream" => 0, + "subStream" => 256, + _ => 1024, + }; + let start_video = Bc::new_from_xml( BcMeta { msg_id: MSG_ID_VIDEO, @@ -58,7 +64,7 @@ impl BcCamera { preview: Some(Preview { version: xml_ver(), channel_id: self.channel_id, - handle: 0, + handle, stream_type: stream_name.to_string(), }), ..Default::default() diff --git a/src/rtsp/config.rs b/src/rtsp/config.rs index 176b434..fb2ead6 100644 --- a/src/rtsp/config.rs +++ b/src/rtsp/config.rs @@ -7,7 +7,8 @@ use validator::{Validate, ValidationError}; use validator_derive::Validate; lazy_static! { - static ref RE_STREAM_SRC: Regex = Regex::new(r"^(mainStream|subStream|both)$").unwrap(); + static ref RE_STREAM_SRC: Regex = + Regex::new(r"^(mainStream|subStream|externStream|both|all)$").unwrap(); static ref RE_TLS_CLIENT_AUTH: Regex = Regex::new(r"^(none|request|require)$").unwrap(); } diff --git a/src/rtsp/mod.rs b/src/rtsp/mod.rs index ca5a030..dfb0b91 100644 --- a/src/rtsp/mod.rs +++ b/src/rtsp/mod.rs @@ -89,7 +89,7 @@ pub fn main(opt: Opt) -> Result<()> { get_permitted_users(config.users.as_slice(), &arc_cam.permitted_users); // Set up each main and substream according to all the RTSP mount paths we support - if ["both", "mainStream"].iter().any(|&e| e == arc_cam.stream) { + if ["all", "both", "mainStream"].iter().any(|&e| e == arc_cam.stream) { let paths = &[ &*format!("/{}", arc_cam.name), &*format!("/{}/mainStream", arc_cam.name), @@ -100,7 +100,7 @@ pub fn main(opt: Opt) -> Result<()> { let main_camera = arc_cam.clone(); s.spawn(move |_| camera_loop(&*main_camera, "mainStream", &mut outputs, true)); } - if ["both", "subStream"].iter().any(|&e| e == arc_cam.stream) { + if ["all", "both", "subStream"].iter().any(|&e| e == arc_cam.stream) { let paths = &[&*format!("/{}/subStream", arc_cam.name)]; let mut outputs = rtsp .add_stream(paths, &permitted_users) @@ -109,6 +109,15 @@ pub fn main(opt: Opt) -> Result<()> { let manage = arc_cam.stream == "subStream"; s.spawn(move |_| camera_loop(&*sub_camera, "subStream", &mut outputs, manage)); } + if ["all", "externStream"].iter().any(|&e| e == arc_cam.stream) { + let paths = &[&*format!("/{}/externStream", arc_cam.name)]; + let mut outputs = rtsp + .add_stream(paths, &permitted_users) + .unwrap(); + let sub_camera = arc_cam.clone(); + let manage = arc_cam.stream == "externStream"; + s.spawn(move |_| camera_loop(&*sub_camera, "externStream", &mut outputs, manage)); + } } rtsp.run(&config.bind_addr, config.bind_port);