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

decodebin2: Make sure to fixate Parser/Converter caps before continuing autoplugging

Browse source
This commit is contained in:
Sebastian Dröge 2011-09-07 16:43:36 +02:00
parent a22faad18a
commit 9e2ce5bbb5
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/playback/gstdecodebin2.c
View file

@ -1378,13 +1378,14 @@ analyze_new_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad,
GstDecodePad *dpad; GstDecodePad *dpad;
GstElementFactory *factory; GstElementFactory *factory;
const gchar *classification; const gchar *classification;
gboolean is_parser_converter; gboolean is_parser_converter = FALSE;
GST_DEBUG_OBJECT (dbin, "Pad %s:%s caps:%" GST_PTR_FORMAT, GST_DEBUG_OBJECT (dbin, "Pad %s:%s caps:%" GST_PTR_FORMAT,
GST_DEBUG_PAD_NAME (pad), caps); GST_DEBUG_PAD_NAME (pad), caps);
if (chain->elements if (chain->elements
&& src != ((GstDecodeElement *) chain->elements->data)->element) { && src != ((GstDecodeElement *) chain->elements->data)->element
&& src != ((GstDecodeElement *) chain->elements->data)->capsfilter) {
GST_ERROR_OBJECT (dbin, "New pad from not the last element in this chain"); GST_ERROR_OBJECT (dbin, "New pad from not the last element in this chain");
return; return;
} }
@ -1595,6 +1596,11 @@ analyze_new_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad,
p = gst_element_get_static_pad (delem->capsfilter, "src"); p = gst_element_get_static_pad (delem->capsfilter, "src");
gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (dpad), p); gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (dpad), p);
pad = p; pad = p;
if (!gst_caps_is_fixed (caps)) {
g_value_array_free (factories);
goto non_fixed;
}
} }
/* 1.h else continue autoplugging something from the list. */ /* 1.h else continue autoplugging something from the list. */
@ -1705,6 +1711,12 @@ setup_caps_delay:
g_signal_connect (G_OBJECT (pad), "notify::caps", g_signal_connect (G_OBJECT (pad), "notify::caps",
G_CALLBACK (caps_notify_cb), chain); G_CALLBACK (caps_notify_cb), chain);
CHAIN_MUTEX_UNLOCK (chain); CHAIN_MUTEX_UNLOCK (chain);
/* If we're here because we have a Parser/Converter
* we have to unref the pad */
if (is_parser_converter)
gst_object_unref (pad);
return; return;
} }
} }