From e5e90f6035ee3859b206b86c52dbe8a28a2f702f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 27 Apr 2010 15:26:13 +0200 Subject: [PATCH] matroskamux: Add support for On2 VP8 ...matroskademux automatically supports it through libgstriff. --- gst/matroska/matroska-demux.c | 4 ++++ gst/matroska/matroska-ids.h | 1 + gst/matroska/matroska-mux.c | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index ecbcd2d..0dc975d 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -6408,6 +6408,10 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext * } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_DIRAC)) { caps = gst_caps_new_simple ("video/x-dirac", NULL); context->send_xiph_headers = FALSE; + *codec_name = g_strdup_printf ("Dirac"); + } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_VP8)) { + caps = gst_caps_new_simple ("video/x-vp8", NULL); + *codec_name = g_strdup_printf ("On2 VP8"); } else { GST_WARNING ("Unknown codec '%s', cannot build Caps", codec_id); return NULL; diff --git a/gst/matroska/matroska-ids.h b/gst/matroska/matroska-ids.h index 4c64875..a2bf198 100644 --- a/gst/matroska/matroska-ids.h +++ b/gst/matroska/matroska-ids.h @@ -337,6 +337,7 @@ #define GST_MATROSKA_CODEC_ID_VIDEO_QUICKTIME "V_QUICKTIME" #define GST_MATROSKA_CODEC_ID_VIDEO_SNOW "V_SNOW" #define GST_MATROSKA_CODEC_ID_VIDEO_DIRAC "V_DIRAC" +#define GST_MATROSKA_CODEC_ID_VIDEO_VP8 "V_VP8" #define GST_MATROSKA_CODEC_ID_AUDIO_MPEG1_L1 "A_MPEG/L1" #define GST_MATROSKA_CODEC_ID_AUDIO_MPEG1_L2 "A_MPEG/L2" diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index b40d165..5829b61 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -121,6 +121,8 @@ static GstStaticPadTemplate videosink_templ = "video/x-pn-realvideo, " "rmversion = (int) [1, 4], " COMMON_VIDEO_CAPS "; " + "video/x-vp8, " + COMMON_VIDEO_CAPS "; " "video/x-raw-yuv, " "format = (fourcc) { YUY2, I420, YV12, UYVY, AYUV }, " COMMON_VIDEO_CAPS "; " @@ -868,6 +870,8 @@ skip_details: } } else if (!strcmp (mimetype, "video/x-dirac")) { context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_DIRAC); + } else if (!strcmp (mimetype, "video/x-vp8")) { + context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_VP8); } else if (!strcmp (mimetype, "video/mpeg")) { gint mpegversion; -- 2.7.4