Commit 115e503b authored by Sebastian Dröge's avatar Sebastian Dröge

Revert "playbin2: Don't put "raw" subtitle types in the raw caps for decodebin2"

This reverts commit 9d753824.

If the DVD subpicture caps are not part of the raw caps, uridecodebin
doesn't qualify resindvdbin as raw source and plugs decodebins, which
causes broken DVD playback because of bugs elsewhere.

This change was originally added to only expose supported, raw subtitles,
e.g. if the subtitle sink did not support DVD subpictures but a converter
to some supported format exists. It's not very important right now because
we have nothing (that is autoplugged) to convert from plaintext/pango-markup
or DVD subpictures to something else.

Fixes bug #623583.
parent 6e9deae7
......@@ -560,10 +560,6 @@ 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; "
"audio/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); \
......@@ -3177,8 +3173,6 @@ 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,8 +3244,7 @@ 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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment