mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin: return the possibly new chain in analyze_new_pad

Browse source 
In the case of analyzing a demuxer chain, analyze_new_pad may create
a new GstDecodeChain.  This was not propagated to the calling function which as
of [d50b713f decodebin: set the decode pad target before setting elements to PAUSED]
is now required to be able to expose the correct pad.

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

22
gst/playback/gstdecodebin2.c
View file

@ -1487,7 +1487,7 @@ decode_pad_set_target (GstDecodePad * dpad, GstPad * target)
/* returns whether to expose the pad */ /* returns whether to expose the pad */
static gboolean static gboolean
analyze_new_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad, analyze_new_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad,
GstCaps * caps, GstDecodeChain * chain) GstCaps * caps, GstDecodeChain * chain, GstDecodeChain ** new_chain)
{ {
gboolean apcontinue = TRUE; gboolean apcontinue = TRUE;
GValueArray *factories = NULL, *result = NULL; GValueArray *factories = NULL, *result = NULL;
@ -1501,6 +1501,9 @@ analyze_new_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad,
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 (new_chain)
*new_chain = chain;
if (chain->elements if (chain->elements
&& src != ((GstDecodeElement *) chain->elements->data)->element && src != ((GstDecodeElement *) chain->elements->data)->element
&& src != ((GstDecodeElement *) chain->elements->data)->capsfilter) { && src != ((GstDecodeElement *) chain->elements->data)->capsfilter) {
@ -1527,7 +1530,8 @@ analyze_new_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad,
CHAIN_MUTEX_LOCK (oldchain); CHAIN_MUTEX_LOCK (oldchain);
group = gst_decode_chain_get_current_group (chain); group = gst_decode_chain_get_current_group (chain);
if (group && !g_list_find (group->children, chain)) { if (group && !g_list_find (group->children, chain)) {
chain = gst_decode_chain_new (dbin, group, pad); g_assert (new_chain != NULL);
*new_chain = chain = gst_decode_chain_new (dbin, group, pad);
group->children = g_list_prepend (group->children, chain); group->children = g_list_prepend (group->children, chain);
} }
CHAIN_MUTEX_UNLOCK (oldchain); CHAIN_MUTEX_UNLOCK (oldchain);
@ -2422,7 +2426,8 @@ connect_pad (GstDecodeBin * dbin, GstElement * src, GstDecodePad * dpad,
GstCaps *ocaps; GstCaps *ocaps;
ocaps = get_pad_caps (opad); ocaps = get_pad_caps (opad);
to_expose = analyze_new_pad (dbin, delem->element, opad, ocaps, chain); to_expose =
analyze_new_pad (dbin, delem->element, opad, ocaps, chain, &chain);
if (ocaps) if (ocaps)
gst_caps_unref (ocaps); gst_caps_unref (ocaps);
@ -2791,8 +2796,10 @@ type_found (GstElement * typefind, guint probability,
* be held (if called from a proxied setcaps), so grab it anyway */ * be held (if called from a proxied setcaps), so grab it anyway */
GST_PAD_STREAM_LOCK (sink_pad); GST_PAD_STREAM_LOCK (sink_pad);
decode_bin->decode_chain = gst_decode_chain_new (decode_bin, NULL, pad); decode_bin->decode_chain = gst_decode_chain_new (decode_bin, NULL, pad);
if (analyze_new_pad (decode_bin, typefind, pad, caps, decode_bin->decode_chain)) if (analyze_new_pad (decode_bin, typefind, pad, caps,
expose_pad (decode_bin, typefind, decode_bin->decode_chain->current_pad, pad, caps, decode_bin->decode_chain); decode_bin->decode_chain, NULL))
expose_pad (decode_bin, typefind, decode_bin->decode_chain->current_pad,
pad, caps, decode_bin->decode_chain);
GST_PAD_STREAM_UNLOCK (sink_pad); GST_PAD_STREAM_UNLOCK (sink_pad);
gst_object_unref (sink_pad); gst_object_unref (sink_pad);
@ -2839,14 +2846,15 @@ pad_added_cb (GstElement * element, GstPad * pad, GstDecodeChain * chain)
{ {
GstCaps *caps; GstCaps *caps;
GstDecodeBin *dbin; GstDecodeBin *dbin;
GstDecodeChain *new_chain;
dbin = chain->dbin; dbin = chain->dbin;
GST_DEBUG_OBJECT (pad, "pad added, chain:%p", chain); GST_DEBUG_OBJECT (pad, "pad added, chain:%p", chain);
caps = get_pad_caps (pad); caps = get_pad_caps (pad);
if (analyze_new_pad (dbin, element, pad, caps, chain)) if (analyze_new_pad (dbin, element, pad, caps, chain, &new_chain))
expose_pad (dbin, element, chain->current_pad, pad, caps, chain); expose_pad (dbin, element, new_chain->current_pad, pad, caps, new_chain);
if (caps) if (caps)
gst_caps_unref (caps); gst_caps_unref (caps);