mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-11-15 14:52:04 +00:00
Code Issues Projects Releases Wiki Activity

fallbacksrc: Always restart the fallback stream on EOS and make sure to EOS all streams if the main stream is EOS

Browse source
This commit is contained in:
Sebastian Dröge 2022-10-05 19:13:36 +03:00
parent 9719b055c5
commit 0b13bfe9dc
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
utils/fallbackswitch/src/fallbacksrc/imp.rs
View file

@ -1866,13 +1866,28 @@ impl FallbackSrc {
if is_image { if is_image {
gst::PadProbeReturn::Ok gst::PadProbeReturn::Ok
} else if state.settings.restart_on_eos { } else if state.settings.restart_on_eos || fallback_source {
src.handle_source_error(&element, state, RetryReason::Eos, fallback_source); src.handle_source_error(&element, state, RetryReason::Eos, fallback_source);
drop(state_guard); drop(state_guard);
element.notify("statistics"); element.notify("statistics");
gst::PadProbeReturn::Drop gst::PadProbeReturn::Drop
} else { } else {
// Send EOS to all sinkpads of the fallbackswitch and also to the other
// stream's fallbackswitch if it doesn't have a main branch.
let mut sinkpads = vec![];
if let Some(stream) = {
if is_video {
state.video_stream.as_ref()
} else {
state.audio_stream.as_ref()
}
} {
sinkpads
.extend(stream.switch.sink_pads().into_iter().filter(|p| p != pad));
}
if let Some(other_stream) = { if let Some(other_stream) = {
if is_video { if is_video {
state.audio_stream.as_ref() state.audio_stream.as_ref()
@ -1881,12 +1896,22 @@ impl FallbackSrc {
} }
} { } {
if other_stream.main_branch.is_none() { if other_stream.main_branch.is_none() {
let sinkpad = other_stream.switch.static_pad("sink").unwrap(); sinkpads.extend(
other_stream
.switch
.sink_pads()
.into_iter()
.filter(|p| p != pad),
);
}
}
let event = ev.clone();
element.call_async(move |_| { element.call_async(move |_| {
sinkpad.send_event(gst::event::Eos::new()); for sinkpad in sinkpads {
sinkpad.send_event(event.clone());
}
}); });
}
}
gst::PadProbeReturn::Ok gst::PadProbeReturn::Ok
} }