mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-30 19:18:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

playbin2: Return NOT_LINKED for unselected text pads from a demuxer

Browse source 
We want to return NOT_LINKED for unselected pads but only for pads
from the normal uridecodebin. This makes sure that subtitle streams
are not raced past audio/video from decodebin2's multiqueue.

For pads from suburidecodebin OK should always be returned, otherwise
it will most likely stop with an error.
This commit is contained in:
Sebastian Dröge 2009-11-04 10:52:06 +01:00
parent f71ed36694
commit 0672457604
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/playback/gstplaybin2.c
View file

@ -2159,20 +2159,26 @@ pad_added_cb (GstElement * decodebin, GstPad * pad, GstSourceGroup * group)
if (changed) { if (changed) {
int signal; int signal;
gboolean always_ok = (decodebin == group->suburidecodebin);
switch (select->type) { switch (select->type) {
case GST_PLAY_SINK_TYPE_VIDEO: case GST_PLAY_SINK_TYPE_VIDEO:
case GST_PLAY_SINK_TYPE_VIDEO_RAW: case GST_PLAY_SINK_TYPE_VIDEO_RAW:
/* we want to return NOT_LINKED for unselected pads but only for audio /* we want to return NOT_LINKED for unselected pads but only for pads
* and video pads because text pads might come from an external file. */ * from the normal uridecodebin. This makes sure that subtitle streams
g_object_set (sinkpad, "always-ok", FALSE, NULL); * are not raced past audio/video from decodebin2's multiqueue.
* For pads from suburidecodebin OK should always be returned, otherwise
* it will most likely stop. */
g_object_set (sinkpad, "always-ok", always_ok, NULL);
signal = SIGNAL_VIDEO_CHANGED; signal = SIGNAL_VIDEO_CHANGED;
break; break;
case GST_PLAY_SINK_TYPE_AUDIO: case GST_PLAY_SINK_TYPE_AUDIO:
case GST_PLAY_SINK_TYPE_AUDIO_RAW: case GST_PLAY_SINK_TYPE_AUDIO_RAW:
g_object_set (sinkpad, "always-ok", FALSE, NULL); g_object_set (sinkpad, "always-ok", always_ok, NULL);
signal = SIGNAL_AUDIO_CHANGED; signal = SIGNAL_AUDIO_CHANGED;
break; break;
case GST_PLAY_SINK_TYPE_TEXT: case GST_PLAY_SINK_TYPE_TEXT:
g_object_set (sinkpad, "always-ok", always_ok, NULL);
signal = SIGNAL_TEXT_CHANGED; signal = SIGNAL_TEXT_CHANGED;
break; break;
case GST_PLAY_SINK_TYPE_SUBPIC: case GST_PLAY_SINK_TYPE_SUBPIC: