Add audio silence during skip too
This commit is contained in:
3 files changed
+32
-6
No files matched your search
+19
-1
@@ -253,11 +253,29 @@ fn build_aac(bin: &Element, stream_config: &StreamConfig) -> Result<AppSrc> {
|
||||
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::<AppSrc>()
|
||||
|
||||
@@ -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
|
||||
}));
|
||||
}
|
||||
|
||||
+6
-2
@@ -596,8 +596,12 @@ fn repeat_keyframe<E, T: Stream<Item = Result<StampedData, E>> + 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<E, T: Stream<Item = Result<StampedData, E>> + 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(())
|
||||
}
|
||||
Reference in new issue
Block a user