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-22 11:30:59 +00:00
Code Issues Projects Releases Wiki Activity

webrtcsink: fix assertions when finalizing

Browse source 
Dumping the pipeline on state changes from an async bus handler was
triggering criticals.

Instead, dump from the sync handler.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1706>
This commit is contained in:
Mathieu Duponchelle 2024-08-12 09:13:06 +02:00
parent 30a5987c9e
commit 0da1c8e9c9
1 changed files with 29 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
net/webrtc/src/webrtcsink/imp.rs
View file

@ -167,10 +167,13 @@ struct CustomBusStream {
} }
impl CustomBusStream { impl CustomBusStream {
fn new(bin: &super::BaseWebRTCSink, bus: &gst::Bus) -> Self { fn new(bin: &super::BaseWebRTCSink, pipeline: &gst::Pipeline, prefix: &str) -> Self {
let (sender, receiver) = futures::channel::mpsc::unbounded(); let (sender, receiver) = futures::channel::mpsc::unbounded();
let bus = pipeline.bus().unwrap();
let bin_weak = bin.downgrade(); let bin_weak = bin.downgrade();
let pipeline_weak = pipeline.downgrade();
let prefix_clone = prefix.to_string();
bus.set_sync_handler(move |_, msg| { bus.set_sync_handler(move |_, msg| {
match msg.view() { match msg.view() {
gst::MessageView::NeedContext(..) | gst::MessageView::HaveContext(..) => { gst::MessageView::NeedContext(..) | gst::MessageView::HaveContext(..) => {
@ -178,6 +181,21 @@ impl CustomBusStream {
let _ = bin.post_message(msg.clone()); let _ = bin.post_message(msg.clone());
} }
} }
gst::MessageView::StateChanged(state_changed) => {
if let Some(pipeline) = pipeline_weak.upgrade() {
if state_changed.src() == Some(pipeline.upcast_ref()) {
pipeline.debug_to_dot_file_with_ts(
gst::DebugGraphDetails::all(),
format!(
"{}-{:?}-to-{:?}",
prefix_clone,
state_changed.old(),
state_changed.current()
),
);
}
}
}
_ => { _ => {
let _ = sender.unbounded_send(msg.clone()); let _ = sender.unbounded_send(msg.clone());
} }
@ -3038,8 +3056,11 @@ impl BaseWebRTCSink {
pipeline.set_start_time(gst::ClockTime::NONE); pipeline.set_start_time(gst::ClockTime::NONE);
pipeline.set_base_time(element.base_time().unwrap()); pipeline.set_base_time(element.base_time().unwrap());
let bus = pipeline.bus().unwrap(); let mut bus_stream = CustomBusStream::new(
let mut bus_stream = CustomBusStream::new(&element, &bus); &element,
&pipeline,
&format!("webrtcsink-session-{session_id}"),
);
let element_clone = element.downgrade(); let element_clone = element.downgrade();
let pipeline_clone = pipeline.downgrade(); let pipeline_clone = pipeline.downgrade();
let session_id_clone = session_id.clone(); let session_id_clone = session_id.clone();
@ -3064,19 +3085,6 @@ impl BaseWebRTCSink {
); );
let _ = this.remove_session(&session_id_clone, true); let _ = this.remove_session(&session_id_clone, true);
} }
gst::MessageView::StateChanged(state_changed) => {
if state_changed.src() == Some(pipeline.upcast_ref()) {
pipeline.debug_to_dot_file_with_ts(
gst::DebugGraphDetails::all(),
format!(
"webrtcsink-session-{}-{:?}-to-{:?}",
session_id_clone,
state_changed.old(),
state_changed.current()
),
);
}
}
gst::MessageView::Latency(..) => { gst::MessageView::Latency(..) => {
gst::info!(CAT, obj = pipeline, "Recalculating latency"); gst::info!(CAT, obj = pipeline, "Recalculating latency");
let _ = pipeline.recalculate_latency(); let _ = pipeline.recalculate_latency();
@ -3653,8 +3661,11 @@ impl BaseWebRTCSink {
.link(&sink) .link(&sink)
.with_context(|| format!("Running discovery pipeline for caps {input_caps}"))?; .with_context(|| format!("Running discovery pipeline for caps {input_caps}"))?;
let bus = pipe.0.bus().unwrap(); let mut stream = CustomBusStream::new(
let mut stream = CustomBusStream::new(&self.obj(), &bus); &self.obj(),
&pipe.0,
&format!("webrtcsink-discovery-{}", pipe.0.name()),
);
pipe.0 pipe.0
.set_state(gst::State::Playing) .set_state(gst::State::Playing)
@ -3677,20 +3688,6 @@ impl BaseWebRTCSink {
); );
break Err(err.error().into()); break Err(err.error().into());
} }
gst::MessageView::StateChanged(s) => {
if msg.src() == Some(pipe.0.upcast_ref()) {
pipe.0.debug_to_dot_file_with_ts(
gst::DebugGraphDetails::all(),
format!(
"webrtcsink-discovery-{}-{:?}-{:?}",
pipe.0.name(),
s.old(),
s.current()
),
);
}
continue;
}
gst::MessageView::Application(appmsg) => { gst::MessageView::Application(appmsg) => {
let caps = match appmsg.structure() { let caps = match appmsg.structure() {
Some(s) => { Some(s) => {