mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 10:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

playback: Fix a small race on decodebin/parsebin shutdown.

Browse source 
When shutting down decodebin2 and parsebin, they set their
output pads to flushing, and there is a very small window
where elements might send a sticky event such as a tag event
(which silently fails due to flushing) and then sends a buffer,
and the buffer will return GST_FLOW_ERROR because it can't
forward sticky events. The element will then send an error
message on the bus. This can also happen when elements send EOS
just as shutdown is happening. Since we're about to destroy all
the elements inside parsebin and decodebin anyway, just discard
error messages from them.

A nicer but more difficult fix for GStreamer 2.0 is to make
all event pushing / handling in core return a GstFlowReturn
like buffers do, so we can report a FLUSHING state cleanly.
This commit is contained in:
Jan Schmidt 2017-01-03 02:23:43 +11:00
parent b00bba5d43
commit c2a91d2cfd
2 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/playback/gstdecodebin2.c
View file

@ -5390,12 +5390,22 @@ gst_decode_bin_handle_message (GstBin * bin, GstMessage * msg)
gboolean drop = FALSE;
if (GST_MESSAGE_TYPE (msg) == GST_MESSAGE_ERROR) {
GST_OBJECT_LOCK (dbin);
drop = (g_list_find (dbin->filtered, GST_MESSAGE_SRC (msg)) != NULL);
if (drop)
dbin->filtered_errors =
g_list_prepend (dbin->filtered_errors, gst_message_ref (msg));
GST_OBJECT_UNLOCK (dbin);
/* Don't pass errors when shutting down. Sometimes,
* elements can generate spurious errors because we set the
* output pads to flushing, and they can't detect that if they
* send an event at exactly the wrong moment */
DYN_LOCK (dbin);
drop = dbin->shutdown;
DYN_UNLOCK (dbin);
if (!drop) {
GST_OBJECT_LOCK (dbin);
drop = (g_list_find (dbin->filtered, GST_MESSAGE_SRC (msg)) != NULL);
if (drop)
dbin->filtered_errors =
g_list_prepend (dbin->filtered_errors, gst_message_ref (msg));
GST_OBJECT_UNLOCK (dbin);
}
} else if (GST_MESSAGE_TYPE (msg) == GST_MESSAGE_BUFFERING) {
gint perc, msg_perc;
gint smaller_perc = 100;

23
gst/playback/gstparsebin.c
View file

@ -4355,12 +4355,23 @@ gst_parse_bin_handle_message (GstBin * bin, GstMessage * msg)
switch (GST_MESSAGE_TYPE (msg)) {
case GST_MESSAGE_ERROR:{
GST_OBJECT_LOCK (parsebin);
drop = (g_list_find (parsebin->filtered, GST_MESSAGE_SRC (msg)) != NULL);
if (drop)
parsebin->filtered_errors =
g_list_prepend (parsebin->filtered_errors, gst_message_ref (msg));
GST_OBJECT_UNLOCK (parsebin);
/* Don't pass errors when shutting down. Sometimes,
* elements can generate spurious errors because we set the
* output pads to flushing, and they can't detect that if they
* send an event at exactly the wrong moment */
DYN_LOCK (parsebin);
drop = parsebin->shutdown;
DYN_UNLOCK (parsebin);
if (!drop) {
GST_OBJECT_LOCK (parsebin);
drop =
(g_list_find (parsebin->filtered, GST_MESSAGE_SRC (msg)) != NULL);
if (drop)
parsebin->filtered_errors =
g_list_prepend (parsebin->filtered_errors, gst_message_ref (msg));
GST_OBJECT_UNLOCK (parsebin);
}
break;
}
default: