From 786218a114cff1edf721b5bda0b2976c733fb0ee Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Tue, 18 Jul 2023 14:51:14 +0700 Subject: [PATCH] Make Stream Not Ready splash optional --- Cargo.lock | 2 +- src/config.rs | 3 +++ src/rtsp/gst/factory.rs | 18 ++++++++++++------ src/rtsp/gst/server.rs | 6 +++++- src/rtsp/gst/shared.rs | 10 ++++++++++ 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3bda377..ca77a33 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1417,7 +1417,7 @@ dependencies = [ [[package]] name = "neolink" -version = "0.5.13" +version = "0.5.14" dependencies = [ "anyhow", "base64 0.21.2", diff --git a/src/config.rs b/src/config.rs index 075b87d..8393245 100644 --- a/src/config.rs +++ b/src/config.rs @@ -120,6 +120,9 @@ pub(crate) struct CameraConfig { alias = "stretching" )] pub(crate) use_smoothing: bool, + + #[serde(default = "default_true", alias = "splash")] + pub(crate) use_splash: bool, } #[derive(Debug, Deserialize, Validate, Clone)] diff --git a/src/rtsp/gst/factory.rs b/src/rtsp/gst/factory.rs index 36b8aae..52c505e 100644 --- a/src/rtsp/gst/factory.rs +++ b/src/rtsp/gst/factory.rs @@ -41,16 +41,17 @@ glib::wrapper! { impl Default for NeoMediaFactory { fn default() -> Self { - Self::new(100, true) + Self::new(100, true, true) } } impl NeoMediaFactory { - pub(crate) fn new(buffer_size: usize, use_smoothing: bool) -> Self { + pub(crate) fn new(buffer_size: usize, use_smoothing: bool, use_splash: bool) -> Self { let factory = Object::new::(); factory.set_shared(false); factory.imp().shared.set_buffer_size(buffer_size); factory.imp().shared.set_use_smoothing(use_smoothing); + factory.imp().shared.set_use_splash(use_splash); factory.set_launch("videotestsrc pattern=\"snow\" ! video/x-raw,width=896,height=512,framerate=25/1 ! textoverlay name=\"inittextoverlay\" text=\"Stream not Ready\" valignment=top halignment=left font-desc=\"Sans, 32\" ! jpegenc ! rtpjpegpay name=pay0"); factory.set_suspend_mode(RTSPSuspendMode::None); factory.set_transport_mode(RTSPTransportMode::PLAY); @@ -183,7 +184,7 @@ impl ObjectImpl for NeoMediaFactoryImpl {} impl RTSPMediaFactoryImpl for NeoMediaFactoryImpl { fn create_element(&self, url: &RTSPUrl) -> Option { self.parent_create_element(url) - .map(|orig| self.build_pipeline(orig).expect("Could not build pipeline")) + .and_then(|orig| self.build_pipeline(orig).expect("Could not build pipeline")) } } @@ -259,7 +260,7 @@ impl NeoMediaFactoryImpl { self.shared.number_of_clients.load(Ordering::Relaxed) } - fn build_pipeline(&self, media: Element) -> AnyResult { + fn build_pipeline(&self, media: Element) -> AnyResult> { // debug!("Building PIPELINE"); let bin = media .dynamic_cast::() @@ -282,6 +283,9 @@ impl NeoMediaFactoryImpl { self.shared.buffer_ready.load(Ordering::Relaxed), ) { (VidFormats::Unknown, true) | (_, false) => { + if !self.shared.get_use_splash() { + return Ok(None); + } debug!("Building Unknown Pipeline"); let source = make_element("videotestsrc", "testvidsrc")?; source.set_property_from_str("pattern", "snow"); @@ -588,8 +592,10 @@ impl NeoMediaFactoryImpl { self.clientsender.blocking_send(client_data)?; // debug!("Pipeline built"); - bin.dynamic_cast::() - .map_err(|_| anyhow!("Cannot cast back")) + let element = bin + .dynamic_cast::() + .map_err(|_| anyhow!("Cannot cast back"))?; + Ok(Some(element)) } async fn join(&self) -> AnyResult<()> { diff --git a/src/rtsp/gst/server.rs b/src/rtsp/gst/server.rs index 52728b2..6e35b9d 100644 --- a/src/rtsp/gst/server.rs +++ b/src/rtsp/gst/server.rs @@ -363,7 +363,11 @@ impl NeoRtspServerImpl { match self.medias.write().await.entry(key.clone()) { Entry::Occupied(_occ) => {} Entry::Vacant(vac) => { - let media = NeoMediaFactory::new(config.buffer_size, config.use_smoothing); + let media = NeoMediaFactory::new( + config.buffer_size, + config.use_smoothing, + config.use_splash, + ); let thread_media = media.clone(); self.threads .write() diff --git a/src/rtsp/gst/shared.rs b/src/rtsp/gst/shared.rs index ad466b7..abddfe2 100644 --- a/src/rtsp/gst/shared.rs +++ b/src/rtsp/gst/shared.rs @@ -25,6 +25,7 @@ pub(super) struct NeoMediaShared { pub(super) buffer_ready: AtomicBool, pub(super) buffer_size: AtomicUsize, pub(super) use_smoothing: AtomicBool, + pub(super) splash: AtomicBool, } impl Default for NeoMediaShared { @@ -36,6 +37,7 @@ impl Default for NeoMediaShared { buffer_ready: AtomicBool::new(false), buffer_size: AtomicUsize::new(100), use_smoothing: AtomicBool::new(false), + splash: AtomicBool::new(true), } } } @@ -56,4 +58,12 @@ impl NeoMediaShared { pub(super) fn set_use_smoothing(&self, new_value: bool) { self.use_smoothing.store(new_value, Ordering::Relaxed) } + + pub(super) fn get_use_splash(&self) -> bool { + self.splash.load(Ordering::Relaxed) + } + + pub(super) fn set_use_splash(&self, new_value: bool) { + self.splash.store(new_value, Ordering::Relaxed) + } }