mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

video/x-dvd-subpicture -> subpicture/x-dvd

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-08-20 21:35:03 +01:00
parent 211b8b6004
commit 5b715cdb90
7 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/pbutils/descriptions.c
View file

@ -172,7 +172,7 @@ static const FormatInfo formats[] = {
{"video/x-dirac", "Dirac", 0}, {"video/x-dirac", "Dirac", 0},
{"video/x-dnxhd", "Digital Nonlinear Extensible High Definition (DNxHD)", 0}, {"video/x-dnxhd", "Digital Nonlinear Extensible High Definition (DNxHD)", 0},
/* FIXME 0.11: rename to subpicture/x-dvd or so */ /* 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-ffv", N_("FFMpeg v1"), 0},
{"video/x-flash-screen", "Flash Screen Video", 0}, {"video/x-flash-screen", "Flash Screen Video", 0},
{"video/x-flash-video", "Sorenson Spark Video", 0}, {"video/x-flash-video", "Sorenson Spark Video", 0},

2
gst-libs/gst/pbutils/gstdiscoverer.c
View file

@ -501,7 +501,7 @@ _event_probe (GstPad * pad, GstPadProbeInfo * info, PrivateStream * ps)
static GstStaticCaps subtitle_caps = GST_STATIC_CAPS ("text/plain; " static GstStaticCaps subtitle_caps = GST_STATIC_CAPS ("text/plain; "
"text/x-pango-markup; subpicture/x-pgs; subpicture/x-dvb; " "text/x-pango-markup; subpicture/x-pgs; subpicture/x-dvb; "
"application/x-subtitle-unknown; application/x-ssa; application/x-ass; " "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 static gboolean
is_subtitle_caps (const GstCaps * caps) is_subtitle_caps (const GstCaps * caps)

2
gst/encoding/gstencodebin.c
View file

@ -234,7 +234,7 @@ struct _StreamGroup
"audio/x-raw; " \ "audio/x-raw; " \
"text/plain; " \ "text/plain; " \
"text/x-pango-markup; " \ "text/x-pango-markup; " \
"video/x-dvd-subpicture; " \ "subpicture/x-dvd; " \
"subpicture/x-pgs" "subpicture/x-pgs"
/* Properties */ /* Properties */

5
gst/playback/gstplaybin2.c
View file

@ -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[1] = "application/x-subtitle";
group->selector[PLAYBIN_STREAM_TEXT].media_list[2] = "application/x-ssa"; 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[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[5] = "subpicture/";
group->selector[PLAYBIN_STREAM_TEXT].media_list[6] = "subtitle/"; group->selector[PLAYBIN_STREAM_TEXT].media_list[6] = "subtitle/";
group->selector[PLAYBIN_STREAM_TEXT].get_media_caps = 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); GST_DEBUG_PAD_NAME (pad), caps, group);
/* major type of the pad, this determines the selector to use, /* major type of the pad, this determines the selector to use,
try exact match first so we don't prematurely match video/ try exact match first */
for video/x-dvd-subpicture */
for (pass = 0; !select && pass < 2; pass++) { for (pass = 0; !select && pass < 2; pass++) {
for (i = 0; i < PLAYBIN_STREAM_LAST; i++) { for (i = 0; i < PLAYBIN_STREAM_LAST; i++) {
if (array_has_value (group->selector[i].media_list, name, pass == 0)) { if (array_has_value (group->selector[i].media_list, name, pass == 0)) {

2
gst/playback/gstrawcaps.h
View file

@ -30,7 +30,7 @@ G_BEGIN_DECLS
"audio/x-raw; " \ "audio/x-raw; " \
"text/plain; " \ "text/plain; " \
"text/x-pango-markup; " \ "text/x-pango-markup; " \
"video/x-dvd-subpicture; " \ "subpicture/x-dvd; " \
"subpicture/x-pgs" "subpicture/x-pgs"
G_END_DECLS G_END_DECLS

2
gst/playback/gstsubtitleoverlay.c
View file

@ -29,7 +29,7 @@
* <refsect2> * <refsect2>
* <title>Examples</title> * <title>Examples</title>
* |[ * |[
* 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. * ]| This will play back the given Matroska file with h264 video and subpicture subtitles.
* </refsect2> * </refsect2>
*/ */

2
tests/check/libs/pbutils.c
View file

@ -266,7 +266,7 @@ static const gchar *caps_strings[] = {
"audio/x-wms", "audio/x-voxware", "video/sp5x", "video/vivo", "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-3ivx", "video/x-4xm", "video/x-apple-video", "video/x-camtasia",
"video/x-cdxa", "video/x-cinepak", "video/x-cirrus-logic-accupak", "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-ffv", "video/x-flash-screen", "video/x-flash-video",
"video/x-h261", "video/x-huffyuv", "video/x-intel-h263", "video/x-jpeg", "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", "video/x-mjpeg", "video/x-mjpeg-b", "video/mpegts", "video/x-mng",