diff --git a/src/rtsp/gst/factory.rs b/src/rtsp/gst/factory.rs index 4642afc..75901a3 100644 --- a/src/rtsp/gst/factory.rs +++ b/src/rtsp/gst/factory.rs @@ -274,8 +274,9 @@ impl NeoMediaFactoryImpl { ) { (VidFormats::Unknown, true) | (_, false) => { debug!("Building Unknown Pipeline"); - let source = make_element("videotestsrc", "vidsrc")?; + let source = make_element("videotestsrc", "testvidsrc")?; source.set_property_from_str("pattern", "snow"); + source.set_property("num-buffers", 500i32); // Send buffers then EOS let queue = make_queue("queue0")?; let queue2 = make_queue2("queue2")?; let overlay = make_element("textoverlay", "overlay")?; diff --git a/src/rtsp/gst/server.rs b/src/rtsp/gst/server.rs index 727b2fb..2a24280 100644 --- a/src/rtsp/gst/server.rs +++ b/src/rtsp/gst/server.rs @@ -174,6 +174,8 @@ impl NeoRtspServer { self.imp().buffer_ready(tag).await } + #[allow(dead_code)] + /// Clear all sessions on a given path pub(crate) async fn clear_session>(&self, tag: T) { let tag: String = tag.into(); if let Some(media) = self.imp().medias.read().await.get(&tag) { @@ -219,6 +221,67 @@ impl NeoRtspServer { })); } + /// Clear all sessions on the rtsp server that are using the not ready stream + pub(crate) async fn clear_session_notready>(&self, tag: T) { + let tag: String = tag.into(); + if let Some(media) = self.imp().medias.read().await.get(&tag) { + self.clear_session_paths_notready(media.paths.iter()); + } + } + + fn clear_session_paths_notready>(&self, paths: impl Iterator) { + let paths: Vec<_> = paths.collect(); + self.client_filter(Some(&mut |_server, client| { + let mut close_client = false; + client.session_filter(Some(&mut |_client, session| { + let mut clean_up = false; + session.filter(Some(&mut |_session, session_media| { + if paths.iter().any(|p| { + let s = p.as_ref(); + session_media + .matches(s) + .map(|amt| amt == s.len() as i32) + .unwrap_or(false) + }) { + // Path is correct now check for no vidsrc + let element = session_media + .media() + .expect("Media should exist") + .element() + .dynamic_cast::() + .expect("Media element should be a bin"); + // debug!("Searching for testvidsrc on {:?}", element.name()); + // for child in element.children().iter() { + // debug!(" - Child: {:?}", child.name()); + // } + if element.child_by_name("testvidsrc").is_some() { + info!("Removing Session Media"); + clean_up = true; + RTSPFilterResult::Remove + } else { + RTSPFilterResult::Keep + } + } else { + RTSPFilterResult::Keep + } + })); + + if clean_up { + close_client = true; + RTSPFilterResult::Remove + } else { + RTSPFilterResult::Keep + } + })); + if close_client { + client.close(); + RTSPFilterResult::Remove + } else { + RTSPFilterResult::Keep + } + })); + } + // Clear buffers on all senders of a tag pub(crate) async fn clear_buffer>(&self, tag: T) -> AnyResult<()> { if let Some(sender) = self.imp().get_sender(tag).await { diff --git a/src/rtsp/mod.rs b/src/rtsp/mod.rs index ced56da..b5da075 100644 --- a/src/rtsp/mod.rs +++ b/src/rtsp/mod.rs @@ -184,15 +184,6 @@ async fn camera_main(camera: Camera) -> Result<(), CameraFailureKi let tags = loggedin.shared.get_tags(); let rtsp_thread = loggedin.get_rtsp(); - // Check if buffers were prepared before we clear - let buffers_prepared = tags - .iter() - .map(|tag| rtsp_thread.buffer_ready(tag)) - .collect::>() - .filter_map(|a| a) - .all(|a| a) - .await; - // Clear all buffers present tags.iter() .map(|tag| rtsp_thread.clear_buffer(tag)) @@ -228,15 +219,14 @@ async fn camera_main(camera: Camera) -> Result<(), CameraFailureKi .collect::>() .await; - if !buffers_prepared { - // Clear all current media and force a reconnect - // This shoudld stop them from watching the "Stream Not Ready Thing" - tags.iter() - .map(|tag| rtsp_thread.clear_session(tag)) - .collect::>() - .collect::>() - .await; - } + // Clear "stream not ready" media to try and force a reconnect + // This shoud stop them from watching the "Stream Not Ready" thing + debug!("Clearing not ready clients"); + tags.iter() + .map(|tag| rtsp_thread.clear_session_notready(tag)) + .collect::>() + .collect::>() + .await; log::info!("{}: Buffers prepared", name); loop { @@ -261,7 +251,6 @@ async fn camera_main(camera: Camera) -> Result<(), CameraFailureKi // Wait for client to disconnect let mut inter = tokio::time::interval(tokio::time::Duration::from_secs_f32(0.01)); - info!("Await Client Pause"); loop { inter.tick().await; let total_clients = tags.iter().map(|tag| rtsp_thread.get_number_of_clients(tag)).collect::>().fold(0usize, |acc, f| acc + f.unwrap_or(0usize)).await;