mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 20:42:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin2: Improve detection of raw caps in expose-all-streams=false mode

Browse source 
Previously we only checked against the raw caps but we should also
check against the return value of autoplug-continue. Additionally fix
a thread-safety issue with accessing the raw caps.
This commit is contained in:
Sebastian Dröge 2011-02-26 23:20:42 +01:00
parent 1265a42124
commit 32c30b88ff
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/playback/gstdecodebin2.c
View file

@ -1463,7 +1463,6 @@ analyze_new_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad,
* if it doesn't match the output caps */ * if it doesn't match the output caps */
if (!dbin->expose_allstreams) { if (!dbin->expose_allstreams) {
guint i; guint i;
GstCaps *rawcaps = gst_static_caps_get (&default_raw_caps);
const GList *tmps; const GList *tmps;
gboolean dontuse = FALSE; gboolean dontuse = FALSE;
@ -1492,13 +1491,21 @@ analyze_new_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad,
if (st->direction != GST_PAD_SRC) if (st->direction != GST_PAD_SRC)
continue; continue;
tcaps = gst_static_pad_template_get_caps (st); tcaps = gst_static_pad_template_get_caps (st);
if (!gst_caps_can_intersect (tcaps, dbin->caps))
apcontinue = TRUE;
/* Emit autoplug-continue to see if the caps are considered to be raw caps */
g_signal_emit (G_OBJECT (dbin),
gst_decode_bin_signals[SIGNAL_AUTOPLUG_CONTINUE], 0, dpad, tcaps,
&apcontinue);
/* If autoplug-continue returns TRUE and the caps are not final, don't use them */
if (apcontinue && !are_final_caps (dbin, tcaps))
dontuse = TRUE; dontuse = TRUE;
gst_caps_unref (tcaps); gst_caps_unref (tcaps);
} }
} }
} }
gst_caps_unref (rawcaps);
if (dontuse) { if (dontuse) {
gst_object_unref (dpad); gst_object_unref (dpad);