From 5b715cdb90a515dbb261e494f0e1dc2dafdf109f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 20 Aug 2012 21:35:03 +0100 Subject: [PATCH] video/x-dvd-subpicture -> subpicture/x-dvd --- gst-libs/gst/pbutils/descriptions.c | 2 +- gst-libs/gst/pbutils/gstdiscoverer.c | 2 +- gst/encoding/gstencodebin.c | 2 +- gst/playback/gstplaybin2.c | 5 ++--- gst/playback/gstrawcaps.h | 2 +- gst/playback/gstsubtitleoverlay.c | 2 +- tests/check/libs/pbutils.c | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gst-libs/gst/pbutils/descriptions.c b/gst-libs/gst/pbutils/descriptions.c index 486ac3b..55aa774 100644 --- a/gst-libs/gst/pbutils/descriptions.c +++ b/gst-libs/gst/pbutils/descriptions.c @@ -172,7 +172,7 @@ static const FormatInfo formats[] = { {"video/x-dirac", "Dirac", 0}, {"video/x-dnxhd", "Digital Nonlinear Extensible High Definition (DNxHD)", 0}, /* FIXME 0.11: rename to subpicture/x-dvd or so */ - {"video/x-dvd-subpicture", "DVD subpicture", 0}, + {"subpicture/x-dvd", "DVD subpicture", 0}, {"video/x-ffv", N_("FFMpeg v1"), 0}, {"video/x-flash-screen", "Flash Screen Video", 0}, {"video/x-flash-video", "Sorenson Spark Video", 0}, diff --git a/gst-libs/gst/pbutils/gstdiscoverer.c b/gst-libs/gst/pbutils/gstdiscoverer.c index 07e2d04..a3f5b9e 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer.c +++ b/gst-libs/gst/pbutils/gstdiscoverer.c @@ -501,7 +501,7 @@ _event_probe (GstPad * pad, GstPadProbeInfo * info, PrivateStream * ps) static GstStaticCaps subtitle_caps = GST_STATIC_CAPS ("text/plain; " "text/x-pango-markup; subpicture/x-pgs; subpicture/x-dvb; " "application/x-subtitle-unknown; application/x-ssa; application/x-ass; " - "subtitle/x-kate; application/x-kate; video/x-dvd-subpicture"); + "subtitle/x-kate; application/x-kate; subpicture/x-dvd"); static gboolean is_subtitle_caps (const GstCaps * caps) diff --git a/gst/encoding/gstencodebin.c b/gst/encoding/gstencodebin.c index 3399dba..2659806 100644 --- a/gst/encoding/gstencodebin.c +++ b/gst/encoding/gstencodebin.c @@ -234,7 +234,7 @@ struct _StreamGroup "audio/x-raw; " \ "text/plain; " \ "text/x-pango-markup; " \ - "video/x-dvd-subpicture; " \ + "subpicture/x-dvd; " \ "subpicture/x-pgs" /* Properties */ diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c index bb85c32..91ad4e4 100644 --- a/gst/playback/gstplaybin2.c +++ b/gst/playback/gstplaybin2.c @@ -1217,7 +1217,7 @@ init_group (GstPlayBin * playbin, GstSourceGroup * group) group->selector[PLAYBIN_STREAM_TEXT].media_list[1] = "application/x-subtitle"; group->selector[PLAYBIN_STREAM_TEXT].media_list[2] = "application/x-ssa"; group->selector[PLAYBIN_STREAM_TEXT].media_list[3] = "application/x-ass"; - group->selector[PLAYBIN_STREAM_TEXT].media_list[4] = "video/x-dvd-subpicture"; + group->selector[PLAYBIN_STREAM_TEXT].media_list[4] = "subpicture/x-dvd"; group->selector[PLAYBIN_STREAM_TEXT].media_list[5] = "subpicture/"; group->selector[PLAYBIN_STREAM_TEXT].media_list[6] = "subtitle/"; group->selector[PLAYBIN_STREAM_TEXT].get_media_caps = @@ -2754,8 +2754,7 @@ pad_added_cb (GstElement * decodebin, GstPad * pad, GstSourceGroup * group) GST_DEBUG_PAD_NAME (pad), caps, group); /* major type of the pad, this determines the selector to use, - try exact match first so we don't prematurely match video/ - for video/x-dvd-subpicture */ + try exact match first */ for (pass = 0; !select && pass < 2; pass++) { for (i = 0; i < PLAYBIN_STREAM_LAST; i++) { if (array_has_value (group->selector[i].media_list, name, pass == 0)) { diff --git a/gst/playback/gstrawcaps.h b/gst/playback/gstrawcaps.h index 7f9ef35..7ebdb29 100644 --- a/gst/playback/gstrawcaps.h +++ b/gst/playback/gstrawcaps.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS "audio/x-raw; " \ "text/plain; " \ "text/x-pango-markup; " \ - "video/x-dvd-subpicture; " \ + "subpicture/x-dvd; " \ "subpicture/x-pgs" G_END_DECLS diff --git a/gst/playback/gstsubtitleoverlay.c b/gst/playback/gstsubtitleoverlay.c index 2b4aff7..4d6e720 100644 --- a/gst/playback/gstsubtitleoverlay.c +++ b/gst/playback/gstsubtitleoverlay.c @@ -29,7 +29,7 @@ * * Examples * |[ - * gst-launch -v filesrc location=test.mkv ! matroskademux name=demux ! "video/x-h264" ! queue2 ! decodebin ! subtitleoverlay name=overlay ! videoconvert ! autovideosink demux. ! "video/x-dvd-subpicture" ! queue2 ! overlay. + * gst-launch -v filesrc location=test.mkv ! matroskademux name=demux ! "video/x-h264" ! queue2 ! decodebin ! subtitleoverlay name=overlay ! videoconvert ! autovideosink demux. ! "subpicture/x-dvd" ! queue2 ! overlay. * ]| This will play back the given Matroska file with h264 video and subpicture subtitles. * */ diff --git a/tests/check/libs/pbutils.c b/tests/check/libs/pbutils.c index f9fd38c..484efa2 100644 --- a/tests/check/libs/pbutils.c +++ b/tests/check/libs/pbutils.c @@ -266,7 +266,7 @@ static const gchar *caps_strings[] = { "audio/x-wms", "audio/x-voxware", "video/sp5x", "video/vivo", "video/x-3ivx", "video/x-4xm", "video/x-apple-video", "video/x-camtasia", "video/x-cdxa", "video/x-cinepak", "video/x-cirrus-logic-accupak", - "video/x-compressed-yuv", "video/x-dirac", "video/x-dvd-subpicture", + "video/x-compressed-yuv", "video/x-dirac", "subpicture/x-dvd", "video/x-ffv", "video/x-flash-screen", "video/x-flash-video", "video/x-h261", "video/x-huffyuv", "video/x-intel-h263", "video/x-jpeg", "video/x-mjpeg", "video/x-mjpeg-b", "video/mpegts", "video/x-mng", -- 2.7.4