mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-10 22:01:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/playback/gstplaybin.c: Block the subtitle bin output queue before ghosting it and linking, then unblock after. Th...

Browse source 
Original commit message from CVS:
* gst/playback/gstplaybin.c: (add_sink), (dummy_blocked_cb),
(setup_sinks):
Block the subtitle bin output queue before ghosting it and linking,
then unblock after. This avoids spurious not-linked errors caused
by the queue starting up (because it gets linked when it is ghosted).
Fixes: #350299
This commit is contained in:
Jan Schmidt 2007-05-24 10:19:54 +00:00
parent e1cacbdc9e
commit c446f911d4
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2007-05-24 Jan Schmidt <thaytan@mad.scientist.com>
* gst/playback/gstplaybin.c: (add_sink), (dummy_blocked_cb),
(setup_sinks):
Block the subtitle bin output queue before ghosting it and linking,
then unblock after. This avoids spurious not-linked errors caused
by the queue starting up (because it gets linked when it is ghosted).
Fixes: #350299
2007-05-23 Jan Schmidt <thaytan@mad.scientist.com> 2007-05-23 Jan Schmidt <thaytan@mad.scientist.com>
* tests/check/elements/playbin.c: (test_suburi_error_unknowntype): * tests/check/elements/playbin.c: (test_suburi_error_unknowntype):

20
gst/playback/gstplaybin.c
View file

@ -1409,7 +1409,8 @@ add_sink (GstPlayBin * play_bin, GstElement * sink, GstPad * srcpad,
/* this is only for debugging */ /* this is only for debugging */
parent = gst_pad_get_parent_element (srcpad); parent = gst_pad_get_parent_element (srcpad);
if (parent) { if (parent) {
GST_DEBUG ("Adding sink with state %d (parent: %d, peer: %d)", GST_DEBUG ("Adding sink %" GST_PTR_FORMAT
" with state %d (parent: %d, peer: %d)", sink,
GST_STATE (sink), GST_STATE (play_bin), GST_STATE (parent)); GST_STATE (sink), GST_STATE (play_bin), GST_STATE (parent));
gst_object_unref (parent); gst_object_unref (parent);
} }
@ -1489,6 +1490,11 @@ subtitle_failed:
} }
} }
static void
dummy_blocked_cb (GstPad * pad, gboolean blocked, gpointer user_data)
{
}
static gboolean static gboolean
setup_sinks (GstPlayBaseBin * play_base_bin, GstPlayBaseGroup * group) setup_sinks (GstPlayBaseBin * play_base_bin, GstPlayBaseGroup * group)
{ {
@ -1496,7 +1502,7 @@ setup_sinks (GstPlayBaseBin * play_base_bin, GstPlayBaseGroup * group)
GList *streaminfo = NULL, *s; GList *streaminfo = NULL, *s;
gboolean need_vis = FALSE; gboolean need_vis = FALSE;
gboolean need_text = FALSE; gboolean need_text = FALSE;
GstPad *textsrcpad = NULL, *pad = NULL; GstPad *textsrcpad = NULL, *pad = NULL, *origtextsrcpad = NULL;
GstElement *sink; GstElement *sink;
gboolean res = TRUE; gboolean res = TRUE;
@ -1553,6 +1559,7 @@ setup_sinks (GstPlayBaseBin * play_base_bin, GstPlayBaseGroup * group)
textsrcpad = textsrcpad =
gst_element_get_pad (group->type[GST_STREAM_TYPE_TEXT - 1].preroll, gst_element_get_pad (group->type[GST_STREAM_TYPE_TEXT - 1].preroll,
"src"); "src");
/* This pad is from subtitle-bin, we need to create a ghost pad to have /* This pad is from subtitle-bin, we need to create a ghost pad to have
common grandparents */ common grandparents */
parent = gst_object_get_parent (GST_OBJECT_CAST (textsrcpad)); parent = gst_object_get_parent (GST_OBJECT_CAST (textsrcpad));
@ -1577,6 +1584,11 @@ setup_sinks (GstPlayBaseBin * play_base_bin, GstPlayBaseGroup * group)
if (!GST_IS_PLAY_BIN (grandparent)) { if (!GST_IS_PLAY_BIN (grandparent)) {
GST_DEBUG_OBJECT (textsrcpad, "this subtitle pad is from a subtitle " GST_DEBUG_OBJECT (textsrcpad, "this subtitle pad is from a subtitle "
"file, ghosting to a suitable hierarchy"); "file, ghosting to a suitable hierarchy");
/* Block the pad first, because as soon as we add a ghostpad, the queue
* will try and start pushing */
gst_pad_set_blocked_async (textsrcpad, TRUE, dummy_blocked_cb, NULL);
origtextsrcpad = gst_object_ref (textsrcpad);
ghost = gst_ghost_pad_new ("text_src", textsrcpad); ghost = gst_ghost_pad_new ("text_src", textsrcpad);
if (!GST_IS_PAD (ghost)) { if (!GST_IS_PAD (ghost)) {
GST_WARNING_OBJECT (textsrcpad, "failed creating ghost pad for " GST_WARNING_OBJECT (textsrcpad, "failed creating ghost pad for "
@ -1618,6 +1630,10 @@ setup_sinks (GstPlayBaseBin * play_base_bin, GstPlayBaseGroup * group)
gst_object_unref (pad); gst_object_unref (pad);
if (textsrcpad) if (textsrcpad)
gst_object_unref (textsrcpad); gst_object_unref (textsrcpad);
if (origtextsrcpad) {
gst_pad_set_blocked_async (origtextsrcpad, FALSE, dummy_blocked_cb, NULL);
gst_object_unref (origtextsrcpad);
}
} }
/* remove the sinks now, pipeline get_state will now wait for the /* remove the sinks now, pipeline get_state will now wait for the