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-29 23:11:01 +00:00
Code Issues Projects Releases Wiki Activity

webrtcsink: avoid panic on unprepare from an async tokio context

Browse source 
.. and log an error with advice on how to dispose of elements properly
from a tokio runtime.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1218>
This commit is contained in:
Mathieu Duponchelle 2023-06-06 23:55:31 +02:00 committed by GStreamer Marge Bot
parent c65b3429ad
commit 271b583876
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ use once_cell::sync::Lazy;
use std::collections::HashMap; use std::collections::HashMap;
use std::ops::Mul; use std::ops::Mul;
use std::sync::{Arc, Condvar, Mutex}; use std::sync::{mpsc, Arc, Condvar, Mutex};
use super::homegrown_cc::CongestionController; use super::homegrown_cc::CongestionController;
use super::{WebRTCSinkCongestionControl, WebRTCSinkError, WebRTCSinkMitigationMode}; use super::{WebRTCSinkCongestionControl, WebRTCSinkError, WebRTCSinkMitigationMode};
@ -1387,7 +1387,7 @@ impl BaseWebRTCSink {
let codecs_done_receiver = std::mem::take(&mut state.codecs_done_receivers); let codecs_done_receiver = std::mem::take(&mut state.codecs_done_receivers);
codecs_done_receiver.into_iter().for_each(|receiver| { codecs_done_receiver.into_iter().for_each(|receiver| {
RUNTIME.spawn(async { RUNTIME.block_on(async {
let _ = receiver.await; let _ = receiver.await;
}); });
}); });
@ -3609,7 +3609,27 @@ impl ElementImpl for BaseWebRTCSink {
match transition { match transition {
gst::StateChange::PausedToReady => { gst::StateChange::PausedToReady => {
if let Err(err) = self.unprepare(&element) { let unprepare_res = match tokio::runtime::Handle::try_current() {
Ok(_) => {
gst::error!(
CAT,
obj: element,
"Trying to set state to NULL from an async \
tokio context, working around the panic but \
you should refactor your code to make use of \
gst::Element::call_async and set the state to \
NULL from there, without blocking the runtime"
);
let (tx, rx) = mpsc::channel();
element.call_async(move |element| {
tx.send(element.imp().unprepare(element)).unwrap();
});
rx.recv().unwrap()
}
Err(_) => self.unprepare(&element),
};
if let Err(err) = unprepare_res {
gst::element_error!( gst::element_error!(
element, element,
gst::StreamError::Failed, gst::StreamError::Failed,