From 561b7f094d051bd506b93b23370128f5baa8c8cf Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Tue, 17 Oct 2023 11:47:05 +0700 Subject: [PATCH] Add audio silence during skip too --- src/rtsp/factory.rs | 20 +++++++++++++++++++- src/rtsp/gst/server.rs | 10 +++++++--- src/rtsp/stream.rs | 8 ++++++-- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/rtsp/factory.rs b/src/rtsp/factory.rs index aaf0546..dc7e148 100644 --- a/src/rtsp/factory.rs +++ b/src/rtsp/factory.rs @@ -253,11 +253,29 @@ fn build_aac(bin: &Element, stream_config: &StreamConfig) -> Result { Ok(ele) => Ok(ele), Err(_) => make_element("avdec_aac", "auddecoder_avdec_aac"), }?; + + // The fallback + let silence = make_element("audiotestsrc", "audsilence")?; + silence.set_property_from_str("wave", "silence"); + let fallback_switch = make_element("fallbackswitch", "audfallbackswitch")?; + fallback_switch.set_property("timeout", 3u64 * 1_000_000_000u64); + fallback_switch.set_property("immediate-fallback", true); + let encoder = make_element("audioconvert", "audencoder")?; let payload = make_element("rtpL16pay", "pay1")?; bin.add_many([&source, &queue, &parser, &decoder, &encoder, &payload])?; - Element::link_many([&source, &queue, &parser, &decoder, &encoder, &payload])?; + bin.add_many([&silence, &fallback_switch])?; + Element::link_many([ + &source, + &queue, + &parser, + &decoder, + &fallback_switch, + &encoder, + &payload, + ])?; + Element::link_many([&silence, &fallback_switch])?; let source = source .dynamic_cast::() diff --git a/src/rtsp/gst/server.rs b/src/rtsp/gst/server.rs index b68e81e..fc41e9d 100644 --- a/src/rtsp/gst/server.rs +++ b/src/rtsp/gst/server.rs @@ -93,11 +93,15 @@ impl NeoRtspServer { let cleanups = sessions.cleanup(); if cleanups > 0 { log::debug!("Cleaned up {cleanups} sessions"); - } else { - log::debug!("Cleaned up had no sessions to cleanup"); } sessions.filter(Some(&mut |_, session| { - log::debug!("{:?}: {}", session.sessionid(), session.timeout(),); + let remaining = session.next_timeout_usec(glib::monotonic_time()); + log::debug!( + "{:?}: {}/{}", + session.sessionid(), + remaining, + session.timeout(), + ); RTSPFilterResult::Keep })); } diff --git a/src/rtsp/stream.rs b/src/rtsp/stream.rs index a214cf8..fc8c589 100644 --- a/src/rtsp/stream.rs +++ b/src/rtsp/stream.rs @@ -596,8 +596,12 @@ fn repeat_keyframe> + Unpin>( } }, _ = sleep(fallback_time) => { + if fallback_time != frame_rate { + // This way we only print once + log::debug!("Inserting Skip Frames"); + } fallback_time = frame_rate; - log::debug!("Inserting Skip Frame"); + yield Ok(repeater.clone()); } } @@ -639,7 +643,7 @@ async fn send_to_appsrc> + Unpin>( appsrc .push_buffer(buf) .map(|_| ()) - .map_err(|_| anyhow!("Could not push buffer to appsrc"))?; + .map_err(|e| anyhow!("Could not push buffer to appsrc: {e:?}"))?; } Ok(()) }