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-09-24 13:00:12 +00:00
Code Issues Projects Releases Wiki Activity

ts: don't panic when operating on a Context without a valid PadContext

Browse source 
Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/issues/94
This commit is contained in:
François Laignel 2020-01-20 09:32:44 +01:00 committed by Sebastian Dröge
parent 0aa5b15564
commit d1cc8eaec8
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gst-plugin-threadshare/src/runtime/pad.rs
View file

@ -73,7 +73,7 @@ use futures::prelude::*;
use gst;
use gst::prelude::*;
use gst::subclass::prelude::*;
use gst::{gst_debug, gst_error, gst_fixme, gst_log, gst_loggable_error};
use gst::{gst_debug, gst_error, gst_fixme, gst_log, gst_loggable_error, gst_warning};
use gst::{FlowError, FlowSuccess};
use std::fmt;
@ -1098,12 +1098,30 @@ impl<'a> PadSinkRef<'a> {
fut: impl Future<Output = Result<FlowSuccess, FlowError>> + Send + 'static,
) -> Result<FlowSuccess, FlowError> {
if Context::is_context_thread() {
self.pad_context()
.as_ref()
.and_then(|pad_ctx_weak| pad_ctx_weak.upgrade())
.expect("Operating on a Context without a valid PadContext")
.add_pending_task(fut.map(|res| res.map(drop)));
Ok(FlowSuccess::Ok)
match self.pad_context().as_ref() {
Some(pad_ctx_weak) => {
pad_ctx_weak
.upgrade()
.expect("PadContext no longer exists")
.add_pending_task(fut.map(|res| res.map(drop)));
Ok(FlowSuccess::Ok)
}
None => {
// This can happen when an upstream element forwards the PadContext sticky event
// after the StreamStart event. While the upstream element should be fixed,
// we have no other solution but blocking the `Context`.
// See https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/issues/94
gst_warning!(
RUNTIME_CAT,
obj: self.gst_pad(),
"Operating on a Context without a PadContext. An upstream element should be fixed.",
);
// Note: we don't use `crate::runtime::executor::block_on` here
// because `Context::is_context_thread()` is checked in the `if`
// statement above.
futures::executor::block_on(fut)
}
}
} else {
// Not on a context thread: execute the Future immediately.
//