From f42191973ae8f2dfa4ac60a7bb6e5e495fc0ab3d Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Mon, 22 May 2023 13:32:15 +0700 Subject: [PATCH] Seperate quality stream pausing --- src/rtsp/mod.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/rtsp/mod.rs b/src/rtsp/mod.rs index 3c63f7a..43f7af0 100644 --- a/src/rtsp/mod.rs +++ b/src/rtsp/mod.rs @@ -252,7 +252,7 @@ async fn camera_main(camera: Camera) -> Result<(), CameraFailureKi v = async { // Wait for error streaming.join().await - } => { + }, if ! active_tags.is_empty() => { info!("{}: Join Pause", name); Ok(StreamChange::StreamError(v)) }, @@ -263,7 +263,7 @@ async fn camera_main(camera: Camera) -> Result<(), CameraFailureKi &active_tags, motion_pause, &name, - ) => { + ), if streaming.shared.get_config().pause.on_motion || streaming.shared.get_config().pause.on_disconnect => { v.with_context(|| format!("{}: Error updating pause state", name)) .map_err(CameraFailureKind::Retry) } @@ -279,7 +279,7 @@ async fn camera_main(camera: Camera) -> Result<(), CameraFailureKi .shared .get_streams() .iter() - .filter(|i| active_tags.contains(i)) + .filter(|i| !active_tags.contains(i)) .copied() .collect::>(); @@ -422,7 +422,8 @@ async fn await_change( v = async { // Wait for client to connect let mut inter = tokio::time::interval(tokio::time::Duration::from_secs_f32(0.01)); - let inactive_tags = shared.get_streams().iter().filter(|i| active_tags.contains(i)).collect::>(); + let inactive_tags = shared.get_streams().iter().filter(|i| !active_tags.contains(i)).collect::>(); + trace!("inactive_tags: {:?}", inactive_tags); loop { inter.tick().await; for tag in inactive_tags.iter() {