mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

bin: Fix EOS forwarding on PLAYING->PLAYING

Browse source 
When doing a transition from PLAYING to PLAYING, we will fail
to forward an EOS message on the bus, and noone else will ever
send it because there'll be no actual state changed message.

Allow EOS through directly in that case.
This commit is contained in:
Jan Schmidt 2016-05-14 23:36:43 +10:00
parent 794944f779
commit 174a5e93e2
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/gstbin.c
View file

@ -3319,10 +3319,12 @@ bin_do_eos (GstBin * bin)
GST_OBJECT_LOCK (bin); GST_OBJECT_LOCK (bin);
/* If all sinks are EOS, we're in PLAYING and no state change is pending /* If all sinks are EOS, we're in PLAYING and no state change is pending
* we forward the EOS message to the parent bin or application * (or we're doing playing to playing and noone else will trigger posting
* EOS for us) we forward the EOS message to the parent bin or application
*/ */
eos = GST_STATE (bin) == GST_STATE_PLAYING eos = GST_STATE (bin) == GST_STATE_PLAYING
&& GST_STATE_PENDING (bin) == GST_STATE_VOID_PENDING && (GST_STATE_PENDING (bin) == GST_STATE_VOID_PENDING ||
GST_STATE_PENDING (bin) == GST_STATE_PLAYING)
&& bin->priv->posted_playing && is_eos (bin, &seqnum); && bin->priv->posted_playing && is_eos (bin, &seqnum);
GST_OBJECT_UNLOCK (bin); GST_OBJECT_UNLOCK (bin);
@ -3345,6 +3347,9 @@ bin_do_eos (GstBin * bin)
GST_DEBUG_OBJECT (bin, GST_DEBUG_OBJECT (bin,
"all sinks posted EOS, posting seqnum #%" G_GUINT32_FORMAT, seqnum); "all sinks posted EOS, posting seqnum #%" G_GUINT32_FORMAT, seqnum);
gst_element_post_message (GST_ELEMENT_CAST (bin), tmessage); gst_element_post_message (GST_ELEMENT_CAST (bin), tmessage);
} else {
GST_LOG_OBJECT (bin, "Not forwarding EOS due to in progress state change, "
" or already posted, or waiting for more EOS");
} }
} }