diff --git a/src/rtsp/gst/server.rs b/src/rtsp/gst/server.rs index 15e2bad..04ff087 100644 --- a/src/rtsp/gst/server.rs +++ b/src/rtsp/gst/server.rs @@ -13,7 +13,7 @@ use gstreamer_rtsp_server::{ gio::{TlsAuthenticationMode, TlsCertificate}, prelude::*, subclass::prelude::*, - RTSPAuth, RTSPServer, RTSPToken, RTSP_TOKEN_MEDIA_FACTORY_ROLE, + RTSPAuth, RTSPFilterResult, RTSPServer, RTSPToken, RTSP_TOKEN_MEDIA_FACTORY_ROLE, }; use log::*; use neolink_core::bcmedia::model::*; @@ -168,6 +168,33 @@ impl NeoRtspServer { pub(crate) async fn buffer_ready>(&self, tag: T) -> Option { self.imp().buffer_ready(tag).await } + + 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) { + self.clear_session_paths(media.paths.iter()); + } + } + + fn clear_session_paths>(&self, paths: impl Iterator) { + let paths: Vec<_> = paths.collect(); + for client in self.client_filter(None) { + for session in client.session_filter(None) { + session.filter(Some(&mut |_session, session_media| { + if paths.iter().any(|p| { + session_media + .matches(p.as_ref()) + .map(|amt| amt > 0) + .unwrap_or(false) + }) { + RTSPFilterResult::Remove + } else { + RTSPFilterResult::Keep + } + })); + } + } + } } unsafe impl Send for NeoRtspServer {} diff --git a/src/rtsp/mod.rs b/src/rtsp/mod.rs index bf4bc70..c3ee6cd 100644 --- a/src/rtsp/mod.rs +++ b/src/rtsp/mod.rs @@ -201,6 +201,13 @@ async fn camera_main(camera: Camera) -> Result<(), CameraFailureKi break; } } + // 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; log::info!("{}: Buffers prepared", name); // tokio::task::spawn(async move {