mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin: track the exposable pads through connect_pad

Browse source 
The logic introduced by
[d50b713: decodebin: set the decode pad target before setting elements to PAUSED]
to expose pads would only ever be able to possibly expose one (the last) pad per element.

Make it so that any exposable pads are able to be exposed rather than just the
last pad returned by connect_element.

https://bugzilla.gnome.org/show_bug.cgi?id=742924
This commit is contained in:
Matthew Waters 2015-10-20 03:58:26 +11:00 committed by Sebastian Dröge
parent 94d81fc713
commit 44871680f0
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gst/playback/gstdecodebin2.c
View file

@ -2095,7 +2095,6 @@ connect_pad (GstDecodeBin * dbin, GstElement * src, GstDecodePad * dpad,
gboolean subtitle;
GList *to_connect = NULL;
gboolean is_parser_converter = FALSE;
gboolean to_expose = FALSE;
/* Set dpad target to pad again, it might've been unset
* below but we came back here because something failed
@ -2421,8 +2420,9 @@ connect_pad (GstDecodeBin * dbin, GstElement * src, GstDecodePad * dpad,
{
GList *l;
for (l = to_connect; l; l = g_list_next (l)) {
for (l = to_connect; l;) {
GstPad *opad = GST_PAD_CAST (l->data);
gboolean to_expose = FALSE;
GstCaps *ocaps;
ocaps = get_pad_caps (opad);
@ -2432,10 +2432,19 @@ connect_pad (GstDecodeBin * dbin, GstElement * src, GstDecodePad * dpad,
if (ocaps)
gst_caps_unref (ocaps);
gst_object_unref (opad);
if (!to_expose) {
GList *l2 = l;
gst_object_unref (opad);
l2 = g_list_next (l);
to_connect = g_list_delete_link (to_connect, l);
l = l2;
} else {
l = g_list_next (l);
}
}
g_list_free (to_connect);
to_connect = NULL;
/* any pads left in to_connect are to be exposed */
}
/* Bring the element to the state of the parent */
@ -2547,8 +2556,23 @@ connect_pad (GstDecodeBin * dbin, GstElement * src, GstDecodePad * dpad,
SUBTITLE_UNLOCK (dbin);
}
if (to_expose)
expose_pad (dbin, delem->element, dpad, pad, caps, chain);
{
GList *l;
for (l = to_connect; l; l = g_list_next (l)) {
GstPad *opad = GST_PAD_CAST (l->data);
GstCaps *ocaps;
ocaps = get_pad_caps (opad);
expose_pad (dbin, delem->element, dpad, opad, ocaps, chain);
if (ocaps)
gst_caps_unref (ocaps);
gst_object_unref (opad);
}
g_list_free (to_connect);
to_connect = NULL;
}
res = TRUE;
break;