mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

video/x-xvid -> video/mpeg,mpegversion=4

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-09-03 02:51:24 +01:00
parent fb0f3c17f5
commit 9bf90f47cf
5 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/avi/gstavimux.c
View file

@ -106,10 +106,6 @@ static GstStaticPadTemplate video_sink_factory =
"height = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], "
"framerate = (fraction) [ 0, MAX ], " "framerate = (fraction) [ 0, MAX ], "
"divxversion = (int) [ 3, 5 ]; " "divxversion = (int) [ 3, 5 ]; "
"video/x-xvid, "
"width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], "
"framerate = (fraction) [ 0, MAX ]; "
"video/x-3ivx, " "video/x-3ivx, "
"width = (int) [ 16, 4096 ], " "width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], "

8
gst/matroska/matroska-demux.c
View file

@ -5030,14 +5030,6 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
*codec_name = g_strdup ("MPEG-4 simple profile"); *codec_name = g_strdup ("MPEG-4 simple profile");
} else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_ASP) || } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_ASP) ||
!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_AP)) { !strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_AP)) {
#if 0
caps = gst_caps_new_full (gst_structure_new ("video/x-divx",
"divxversion", G_TYPE_INT, 5, NULL),
gst_structure_new ("video/x-xvid", NULL),
gst_structure_new ("video/mpeg",
"mpegversion", G_TYPE_INT, 4,
"systemstream", G_TYPE_BOOLEAN, FALSE, NULL), NULL);
#endif
caps = gst_caps_new_simple ("video/mpeg", caps = gst_caps_new_simple ("video/mpeg",
"mpegversion", G_TYPE_INT, 4, "mpegversion", G_TYPE_INT, 4,
"systemstream", G_TYPE_BOOLEAN, FALSE, NULL); "systemstream", G_TYPE_BOOLEAN, FALSE, NULL);

11
gst/matroska/matroska-mux.c
View file

@ -110,8 +110,6 @@ static GstStaticPadTemplate videosink_templ =
COMMON_VIDEO_CAPS "; " COMMON_VIDEO_CAPS "; "
"video/x-divx, " "video/x-divx, "
COMMON_VIDEO_CAPS "; " COMMON_VIDEO_CAPS "; "
"video/x-xvid, "
COMMON_VIDEO_CAPS "; "
"video/x-huffyuv, " "video/x-huffyuv, "
COMMON_VIDEO_CAPS "; " COMMON_VIDEO_CAPS "; "
"video/x-dv, " "video/x-dv, "
@ -994,9 +992,8 @@ skip_details:
videocontext->fourcc = GST_STR_FOURCC (fstr); videocontext->fourcc = GST_STR_FOURCC (fstr);
} else if (!strcmp (mimetype, "image/jpeg")) { } else if (!strcmp (mimetype, "image/jpeg")) {
gst_matroska_mux_set_codec_id (context, GST_MATROSKA_CODEC_ID_VIDEO_MJPEG); gst_matroska_mux_set_codec_id (context, GST_MATROSKA_CODEC_ID_VIDEO_MJPEG);
} else if (!strcmp (mimetype, "video/x-xvid") /* MS/VfW compatibility cases */ } else if (!strcmp (mimetype, "video/x-huffyuv") /* MS/VfW compatibility cases */
||!strcmp (mimetype, "video/x-huffyuv") ||!strcmp (mimetype, "video/x-divx")
|| !strcmp (mimetype, "video/x-divx")
|| !strcmp (mimetype, "video/x-dv") || !strcmp (mimetype, "video/x-dv")
|| !strcmp (mimetype, "video/x-h263") || !strcmp (mimetype, "video/x-h263")
|| !strcmp (mimetype, "video/x-msmpeg") || !strcmp (mimetype, "video/x-msmpeg")
@ -1006,9 +1003,7 @@ skip_details:
gint size = sizeof (gst_riff_strf_vids); gint size = sizeof (gst_riff_strf_vids);
guint32 fourcc = 0; guint32 fourcc = 0;
if (!strcmp (mimetype, "video/x-xvid")) if (!strcmp (mimetype, "video/x-huffyuv"))
fourcc = GST_MAKE_FOURCC ('X', 'V', 'I', 'D');
else if (!strcmp (mimetype, "video/x-huffyuv"))
fourcc = GST_MAKE_FOURCC ('H', 'F', 'Y', 'U'); fourcc = GST_MAKE_FOURCC ('H', 'F', 'Y', 'U');
else if (!strcmp (mimetype, "video/x-dv")) else if (!strcmp (mimetype, "video/x-dv"))
fourcc = GST_MAKE_FOURCC ('D', 'V', 'S', 'D'); fourcc = GST_MAKE_FOURCC ('D', 'V', 'S', 'D');

3
gst/rtp/gstrtpmp4vpay.c
View file

@ -35,8 +35,7 @@ static GstStaticPadTemplate gst_rtp_mp4v_pay_sink_template =
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("video/mpeg," GST_STATIC_CAPS ("video/mpeg,"
"mpegversion=(int) 4," "systemstream=(boolean)false;" "mpegversion=(int) 4, systemstream=(boolean)false;" "video/x-divx")
"video/x-xvid; video/x-divx")
); );
static GstStaticPadTemplate gst_rtp_mp4v_pay_src_template = static GstStaticPadTemplate gst_rtp_mp4v_pay_src_template =

3
tests/check/elements/avimux.c
View file

@ -32,7 +32,8 @@ static GstPad *mysrcpad, *mysinkpad;
#define AUDIO_CAPS_STRING "audio/x-ac3, " \ #define AUDIO_CAPS_STRING "audio/x-ac3, " \
"channels = (int) 1, " \ "channels = (int) 1, " \
"rate = (int) 8000" "rate = (int) 8000"
#define VIDEO_CAPS_STRING "video/x-xvid, " \ #define VIDEO_CAPS_STRING "video/mpeg, mpegversion = (int) 4, " \
"systemstream = (bool) false, " \
"width = (int) 384, " \ "width = (int) 384, " \
"height = (int) 288, " \ "height = (int) 288, " \
"framerate = (fraction) 25/1" "framerate = (fraction) 25/1"