Commit 2483c82b authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠

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

parent cc167a23
......@@ -20,7 +20,7 @@
<name>subpicture</name>
<direction>sink</direction>
<presence>always</presence>
<details>video/x-dvd-subpicture; subpicture/x-pgs</details>
<details>subpicture/x-dvd; subpicture/x-pgs</details>
</caps>
<caps>
<name>video</name>
......
......@@ -26,7 +26,7 @@
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>text/plain; text/x-pango-markup; video/x-dvd-subpicture</details>
<details>text/plain; text/x-pango-markup; subpicture/x-dvd</details>
</caps>
</pads>
</element>
......@@ -41,7 +41,7 @@
<name>sink</name>
<direction>sink</direction>
<presence>always</presence>
<details>text/plain; text/x-pango-markup; video/x-dvd-subpicture</details>
<details>text/plain; text/x-pango-markup; subpicture/x-dvd</details>
</caps>
<caps>
<name>src</name>
......
......@@ -38,7 +38,7 @@
<name>subpicture_%02x</name>
<direction>source</direction>
<presence>sometimes</presence>
<details>video/x-dvd-subpicture</details>
<details>subpicture/x-dvd</details>
</caps>
<caps>
<name>video_%02x</name>
......
......@@ -39,7 +39,7 @@ Edward Hervey &lt;edward.hervey@collabora.co.uk&gt;</author>
<name>subpicture_%04x</name>
<direction>source</direction>
<presence>sometimes</presence>
<details>subpicture/x-pgs; video/x-dvd-subpicture</details>
<details>subpicture/x-pgs; subpicture/x-dvd</details>
</caps>
<caps>
<name>video_%04x</name>
......
......@@ -26,7 +26,7 @@
<name>subpicture</name>
<direction>source</direction>
<presence>sometimes</presence>
<details>video/x-dvd-subpicture</details>
<details>subpicture/x-dvd</details>
</caps>
<caps>
<name>video</name>
......
......@@ -527,7 +527,7 @@ gst_kate_enc_setcaps (GstPad * pad, GstCaps * caps)
GST_ELEMENT_WARNING (ke, LIBRARY, SETTINGS, (NULL),
("Category set to '%s', but input is text-based.", ke->category));
}
} else if (gst_structure_has_name (s, "video/x-dvd-subpicture")) {
} else if (gst_structure_has_name (s, "subpicture/x-dvd")) {
if (strcmp (ke->category, "SUB") == 0 ||
strcmp (ke->category, "subtitles") == 0) {
GST_ELEMENT_WARNING (ke, LIBRARY, SETTINGS, (NULL),
......
......@@ -33,7 +33,7 @@
#define GST_KATE_STM_TO_GST(stm) ((GST_MSECOND * 1024 * (stm)) / 90)
#define GST_KATE_GST_TO_STM(gst) ((int)(((gst) * 90000 ) / 1024))
#define GST_KATE_SPU_MIME_TYPE "video/x-dvd-subpicture"
#define GST_KATE_SPU_MIME_TYPE "subpicture/x-dvd"
G_BEGIN_DECLS
......
......@@ -299,7 +299,7 @@ gst_kate_util_decoder_base_chain_kate_packet (GstKateDecoderBase * decoder,
}
if (strcmp (decoder->k.ki->category, "K-SPU") == 0 ||
strcmp (decoder->k.ki->category, "spu-subtitles") == 0) {
*src_caps = gst_caps_new_empty_simple ("video/x-dvd-subpicture");
*src_caps = gst_caps_new_empty_simple ("subpicture/x-dvd");
} else if (decoder->k.ki->text_markup_type == kate_markup_none) {
*src_caps = gst_caps_new_empty_simple ("text/plain");
} else {
......
......@@ -89,7 +89,7 @@ static GstStaticPadTemplate subpicture_template =
GST_STATIC_PAD_TEMPLATE ("subpicture_%02x",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS ("video/x-dvd-subpicture")
GST_STATIC_CAPS ("subpicture/x-dvd")
);
static GstStaticPadTemplate private_template =
......@@ -313,7 +313,7 @@ gst_flups_demux_create_stream (GstFluPSDemux * demux, gint id, gint stream_type)
case ST_PS_DVD_SUBPICTURE:
template = klass->subpicture_template;
name = g_strdup_printf ("subpicture_%02x", id);
caps = gst_caps_new_simple ("video/x-dvd-subpicture", NULL);
caps = gst_caps_new_simple ("subpicture/x-dvd", NULL);
break;
case ST_GST_AUDIO_RAWA52:
template = klass->audio_template;
......
......@@ -76,7 +76,7 @@ static GstStaticPadTemplate subpicture_src_template =
GST_STATIC_PAD_TEMPLATE ("subpicture",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS ("video/x-dvd-subpicture")
GST_STATIC_CAPS ("subpicture/x-dvd")
);
static void rsn_dvdbin_do_init (GType rsn_dvdbin_type);
......@@ -696,7 +696,7 @@ demux_pad_added (GstElement * element, GstPad * pad, RsnDvdBin * dvdbin)
if (can_sink_caps (dvdbin->pieces[DVD_ELEM_VIDDEC], caps)) {
dest_pad =
gst_element_get_static_pad (dvdbin->pieces[DVD_ELEM_VIDDEC], "sink");
} else if (g_str_equal (gst_structure_get_name (s), "video/x-dvd-subpicture")) {
} else if (g_str_equal (gst_structure_get_name (s), "subpicture/x-dvd")) {
dest_pad =
gst_element_get_request_pad (dvdbin->pieces[DVD_ELEM_SPU_SELECT],
"sink_%u");
......
......@@ -78,7 +78,7 @@ static GstStaticPadTemplate subpic_sink_factory =
GST_STATIC_PAD_TEMPLATE ("subpicture",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("video/x-dvd-subpicture; subpicture/x-pgs")
GST_STATIC_CAPS ("subpicture/x-dvd; subpicture/x-pgs")
);
static const guint32 default_clut[16] = {
......@@ -1156,7 +1156,7 @@ gst_dvd_spu_subpic_set_caps (GstPad * pad, GstCaps * caps)
s = gst_caps_get_structure (caps, 0);
if (gst_structure_has_name (s, "video/x-dvd-subpicture")) {
if (gst_structure_has_name (s, "subpicture/x-dvd")) {
input_type = SPU_INPUT_TYPE_VOBSUB;
} else if (gst_structure_has_name (s, "subpicture/x-pgs")) {
input_type = SPU_INPUT_TYPE_PGS;
......
......@@ -128,7 +128,7 @@ static GstStaticPadTemplate subpicture_template =
GST_STATIC_PAD_TEMPLATE ("subpicture_%02x",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS ("video/x-dvd-subpicture")
GST_STATIC_CAPS ("subpicture/x-dvd")
);
static GstStaticPadTemplate private_template =
......@@ -400,7 +400,7 @@ gst_flups_demux_create_stream (GstFluPSDemux * demux, gint id, gint stream_type)
case ST_PS_DVD_SUBPICTURE:
template = klass->subpicture_template;
name = g_strdup_printf ("subpicture_%02x", id);
caps = gst_caps_new_empty_simple ("video/x-dvd-subpicture");
caps = gst_caps_new_empty_simple ("subpicture/x-dvd");
break;
case ST_GST_AUDIO_RAWA52:
template = klass->audio_template;
......
......@@ -187,7 +187,7 @@ struct _TSDemuxStream
/* Can also use the subpicture pads for text subtitles? */
#define SUBPICTURE_CAPS \
GST_STATIC_CAPS ("subpicture/x-pgs; video/x-dvd-subpicture")
GST_STATIC_CAPS ("subpicture/x-pgs; subpicture/x-dvd")
static GstStaticPadTemplate video_template =
GST_STATIC_PAD_TEMPLATE ("video_%04x", GST_PAD_SRC,
......@@ -947,7 +947,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream,
case ST_PS_DVD_SUBPICTURE:
template = gst_static_pad_template_get (&subpicture_template);
name = g_strdup_printf ("subpicture_%04x", bstream->pid);
caps = gst_caps_new_empty_simple ("video/x-dvd-subpicture");
caps = gst_caps_new_empty_simple ("subpicture/x-dvd");
break;
case ST_BD_PGS_SUBPICTURE:
template = gst_static_pad_template_get (&subpicture_template);
......
......@@ -514,7 +514,7 @@ GST_START_TEST (test_kate_encode_spu)
GST_BUFFER_DURATION (inbuffer) = 5 * GST_SECOND;
ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
caps = gst_caps_from_string ("video/x-dvd-subpicture");
caps = gst_caps_from_string ("subpicture/x-dvd");
fail_unless (caps != NULL);
gst_buffer_set_caps (inbuffer, caps);
gst_caps_unref (caps);
......
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