mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

typefinding, ogg: don't bother with annodex media types

Browse source 
They're hardly used, and probably more confusing than anything
else, and it's not clear that anyone would really need to be
able to tell them apart at the media type level.
This commit is contained in:
Tim-Philipp Müller 2012-05-13 18:49:31 +01:00
parent 657fe5efff
commit 0e216d1f4c
3 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/ogg/gstoggdemux.c
View file

@ -1912,9 +1912,7 @@ static GstStaticPadTemplate ogg_demux_sink_template_factory =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("application/ogg; audio/ogg; video/ogg; "
"application/annodex; audio/annodex; video/annodex; "
"application/kate")
GST_STATIC_CAPS ("application/ogg; audio/ogg; video/ogg; application/kate")
);
static void gst_ogg_demux_finalize (GObject * object);

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

@ -65,11 +65,9 @@ typedef struct
static const FormatInfo formats[] = {
/* container/tag formats with static descriptions */
{"audio/annodex", "Ogg", FLAG_CONTAINER},
{"audio/ogg", "Ogg", FLAG_CONTAINER},
{"audio/webm", "WebM", FLAG_CONTAINER},
{"audio/x-matroska", "Matroska", FLAG_CONTAINER},
{"application/annodex", "Ogg", FLAG_CONTAINER},
{"application/gxf", "General Exchange Format (GXF)", FLAG_CONTAINER},
{"application/ogg", "Ogg", FLAG_CONTAINER},
{"application/kate", "Ogg", FLAG_CONTAINER},
@ -83,7 +81,6 @@ static const FormatInfo formats[] = {
{"application/x-pn-realaudio", "RealAudio", FLAG_CONTAINER},
{"application/x-yuv4mpeg", "Y4M", FLAG_CONTAINER},
{"multipart/x-mixed-replace", "Multipart", FLAG_CONTAINER},
{"video/annodex", "Ogg", FLAG_CONTAINER},
{"video/ogg", "Ogg", FLAG_CONTAINER},
{"video/x-fli", "FLI/FLC/FLX Animation", FLAG_CONTAINER},
{"video/x-flv", "Flash", FLAG_CONTAINER},

22
gst/typefind/gsttypefindfunctions.c
View file

@ -3769,12 +3769,11 @@ dv_type_find (GstTypeFind * tf, gpointer private)
}
/*** Ogg and Annodex variants ***/
static GstStaticCaps ogg_annodex_caps =
GST_STATIC_CAPS ("application/ogg;video/ogg;audio/ogg;"
"application/annodex;audio/annodex;video/annodex;application/kate");
/*** Ogg variants ***/
static GstStaticCaps ogg_caps =
GST_STATIC_CAPS ("application/ogg;video/ogg;audio/ogg;application/kate");
#define OGGANX_CAPS (gst_static_caps_get(&ogg_annodex_caps))
#define OGG_CAPS (gst_static_caps_get(&ogg_caps))
typedef enum
{
@ -3864,15 +3863,8 @@ ogganx_type_find (GstTypeFind * tf, gpointer private)
if (ogg_syncs == 0)
return;
/* FIXME: what about XSPF? */
if (hdr_count[OGG_ANNODEX] > 0) {
if (hdr_count[OGG_VIDEO] > 0)
media_type = "video/annodex";
else if (hdr_count[OGG_AUDIO] > 0)
media_type = "audio/annodex";
else
media_type = "application/annodex";
} else if (hdr_count[OGG_VIDEO] > 0) {
/* We don't bother with annodex types. FIXME: what about XSPF? */
if (hdr_count[OGG_VIDEO] > 0) {
media_type = "video/ogg";
} else if (hdr_count[OGG_AUDIO] > 0) {
media_type = "audio/ogg";
@ -4729,7 +4721,7 @@ plugin_init (GstPlugin * plugin)
TYPE_FIND_REGISTER (plugin, "video/mpegts", GST_RANK_PRIMARY,
mpeg_ts_type_find, "ts,mts", MPEGTS_CAPS, NULL, NULL);
TYPE_FIND_REGISTER (plugin, "application/ogg", GST_RANK_PRIMARY,
ogganx_type_find, "ogg,oga,ogv,ogm,ogx,spx,anx,axa,axv", OGGANX_CAPS,
ogganx_type_find, "ogg,oga,ogv,ogm,ogx,spx,anx,axa,axv", OGG_CAPS,
NULL, NULL);
TYPE_FIND_REGISTER (plugin, "video/mpeg-elementary", GST_RANK_MARGINAL,
mpeg_video_stream_type_find, "mpv,mpeg,mpg", MPEG_VIDEO_CAPS, NULL, NULL);