mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 08:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin2: use more efficient way of getting caps

Browse source 
When inspecting the caps of a pad, try to get the pad _CAPS first before calling
the getcaps function.
This commit is contained in:
Wim Taymans 2010-06-28 10:53:57 +02:00
parent 3dbf96faa3
commit 908afd4b15
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gst/playback/gstdecodebin2.c
View file

@ -1753,6 +1753,27 @@ beach:
return res; return res;
} }
static GstCaps *
get_pad_caps (GstPad * pad)
{
GstCaps *caps;
/* first check the pad caps, if this is set, we are positively sure it is
* fixed and exactly what the element will produce. */
GST_OBJECT_LOCK (pad);
if ((caps = GST_PAD_CAPS (pad)))
gst_caps_ref (caps);
GST_OBJECT_UNLOCK (pad);
/* then use the getcaps function if we don't have caps. These caps might not
* be fixed in some cases, in which case analyze_new_pad will set up a
* notify::caps signal to continue autoplugging. */
if (caps == NULL)
caps = gst_pad_get_caps_reffed (pad);
return caps;
}
static gboolean static gboolean
connect_element (GstDecodeBin * dbin, GstElement * element, connect_element (GstDecodeBin * dbin, GstElement * element,
GstDecodeChain * chain) GstDecodeChain * chain)
@ -1841,7 +1862,7 @@ connect_element (GstDecodeBin * dbin, GstElement * element,
GstPad *pad = GST_PAD_CAST (pads->data); GstPad *pad = GST_PAD_CAST (pads->data);
GstCaps *caps; GstCaps *caps;
caps = gst_pad_get_caps_reffed (pad); caps = get_pad_caps (pad);
analyze_new_pad (dbin, element, pad, caps, chain); analyze_new_pad (dbin, element, pad, caps, chain);
if (caps) if (caps)
gst_caps_unref (caps); gst_caps_unref (caps);
@ -1972,19 +1993,7 @@ pad_added_cb (GstElement * element, GstPad * pad, GstDecodeChain * chain)
GST_DEBUG_OBJECT (pad, "pad added, chain:%p", chain); GST_DEBUG_OBJECT (pad, "pad added, chain:%p", chain);
/* first check the pad caps, if this is set, we are positively sure it is caps = get_pad_caps (pad);
* fixed and exactly what the element will produce. */
GST_OBJECT_LOCK (pad);
if ((caps = GST_PAD_CAPS (pad)))
gst_caps_ref (caps);
GST_OBJECT_UNLOCK (pad);
/* then use the getcaps function if we don't have caps. These caps might not
* be fixed in some cases, in which case analyze_new_pad will set up a
* notify::caps signal to continue autoplugging. */
if (caps == NULL)
caps = gst_pad_get_caps_reffed (pad);
analyze_new_pad (dbin, element, pad, caps, chain); analyze_new_pad (dbin, element, pad, caps, chain);
if (caps) if (caps)
gst_caps_unref (caps); gst_caps_unref (caps);
@ -2873,8 +2882,8 @@ sort_end_pads (GstDecodePad * da, GstDecodePad * db)
GstStructure *sa, *sb; GstStructure *sa, *sb;
const gchar *namea, *nameb; const gchar *namea, *nameb;
capsa = gst_pad_get_caps_reffed (GST_PAD_CAST (da)); capsa = get_pad_caps (GST_PAD_CAST (da));
capsb = gst_pad_get_caps_reffed (GST_PAD_CAST (db)); capsb = get_pad_caps (GST_PAD_CAST (db));
sa = gst_caps_get_structure ((const GstCaps *) capsa, 0); sa = gst_caps_get_structure ((const GstCaps *) capsa, 0);
sb = gst_caps_get_structure ((const GstCaps *) capsb, 0); sb = gst_caps_get_structure ((const GstCaps *) capsb, 0);
@ -3015,7 +3024,7 @@ gst_decode_chain_get_topology (GstDecodeChain * chain)
/* Caps that resulted in this chain */ /* Caps that resulted in this chain */
caps = gst_pad_get_negotiated_caps (chain->pad); caps = gst_pad_get_negotiated_caps (chain->pad);
if (!caps) { if (!caps) {
caps = gst_pad_get_caps_reffed (chain->pad); caps = get_pad_caps (chain->pad);
if (G_UNLIKELY (!gst_caps_is_fixed (caps))) { if (G_UNLIKELY (!gst_caps_is_fixed (caps))) {
GST_ERROR_OBJECT (chain->pad, GST_ERROR_OBJECT (chain->pad,
"Couldn't get fixed caps, got %" GST_PTR_FORMAT, caps); "Couldn't get fixed caps, got %" GST_PTR_FORMAT, caps);