From: Sebastian Dröge Date: Tue, 18 May 2010 06:45:52 +0000 (+0200) Subject: playbin2: Don't put "raw" subtitle types in the raw caps for decodebin2 X-Git-Tag: RELEASE-0.10.30~188 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d7538247ff1bf9841b53eeb71ddc47f2c662415;p=platform%2Fupstream%2Fgst-plugins-base.git playbin2: Don't put "raw" subtitle types in the raw caps for decodebin2 We handle them from the autoplug-continue signal, where the caps supported by the subtitle sink or overlay are known already. --- diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c index 44629b9..8a6371f 100644 --- a/gst/playback/gstplaybin2.c +++ b/gst/playback/gstplaybin2.c @@ -559,6 +559,10 @@ static GstElementClass *parent_class; static guint gst_play_bin_signals[LAST_SIGNAL] = { 0 }; +static GstStaticCaps av_raw_caps = GST_STATIC_CAPS ("audio/x-raw-int; " + "video/x-raw-float; " + "video/x-raw-yuv; " "video/x-raw-rgb; " "video/x-raw-gray;"); + #define REMOVE_SIGNAL(obj,id) \ if (id) { \ g_signal_handler_disconnect (obj, id); \ @@ -3179,6 +3183,8 @@ activate_group (GstPlayBin * playbin, GstSourceGroup * group, GstState target) uridecodebin = gst_element_factory_make ("uridecodebin", NULL); if (!uridecodebin) goto no_decodebin; + g_object_set (uridecodebin, "caps", gst_static_caps_get (&av_raw_caps), + NULL); gst_bin_add (GST_BIN_CAST (playbin), uridecodebin); group->uridecodebin = gst_object_ref (uridecodebin); } @@ -3250,7 +3256,8 @@ activate_group (GstPlayBin * playbin, GstSourceGroup * group, GstState target) suburidecodebin = gst_element_factory_make ("uridecodebin", NULL); if (!suburidecodebin) goto no_decodebin; - + g_object_set (uridecodebin, "caps", gst_static_caps_get (&av_raw_caps), + NULL); gst_bin_add (GST_BIN_CAST (playbin), suburidecodebin); group->suburidecodebin = gst_object_ref (suburidecodebin); }