summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2010-05-12 18:50:34 -0700
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2010-05-19 19:24:04 +0200
commitd1cfc5050763634b773c24732ee8a6bee8fd9bb3 (patch)
tree6a849fe53be3393a9a7ce5fac8005d9c53c07b7f /gst
parent5dd5a8292ae8b69cdf751464e3918f0388f61081 (diff)
downloadgstreamer-plugins-bad-d1cfc5050763634b773c24732ee8a6bee8fd9bb3.tar.gz
qtmux: Add VP8
Diffstat (limited to 'gst')
-rw-r--r--gst/qtmux/fourcc.h1
-rw-r--r--gst/qtmux/gstqtmux.c3
-rw-r--r--gst/qtmux/gstqtmuxmap.c3
3 files changed, 6 insertions, 1 deletions
diff --git a/gst/qtmux/fourcc.h b/gst/qtmux/fourcc.h
index 559f45f4f..51a2a5fe1 100644
--- a/gst/qtmux/fourcc.h
+++ b/gst/qtmux/fourcc.h
@@ -147,6 +147,7 @@ G_BEGIN_DECLS
#define FOURCC_s263 GST_MAKE_FOURCC('s','2','6','3')
#define FOURCC_avcC GST_MAKE_FOURCC('a','v','c','C')
#define FOURCC_VP31 GST_MAKE_FOURCC('V','P','3','1')
+#define FOURCC_VP80 GST_MAKE_FOURCC('V','P','8','0')
#define FOURCC_rle_ GST_MAKE_FOURCC('r','l','e',' ')
#define FOURCC_MAC6 GST_MAKE_FOURCC('M','A','C','6')
#define FOURCC_MAC3 GST_MAKE_FOURCC('M','A','C','3')
diff --git a/gst/qtmux/gstqtmux.c b/gst/qtmux/gstqtmux.c
index 5744e19ff..64f71ff4b 100644
--- a/gst/qtmux/gstqtmux.c
+++ b/gst/qtmux/gstqtmux.c
@@ -2411,6 +2411,9 @@ gst_qt_mux_video_sink_set_caps (GstPad * pad, GstCaps * caps)
GST_DEBUG_OBJECT (qtmux, "missing or invalid fourcc in jp2 caps");
goto refuse_caps;
}
+ } else if (strcmp (mimetype, "video/x-vp8") == 0) {
+ entry.fourcc = FOURCC_VP80;
+ sync = FALSE;
} else if (strcmp (mimetype, "video/x-qt-part") == 0) {
guint32 fourcc;
diff --git a/gst/qtmux/gstqtmuxmap.c b/gst/qtmux/gstqtmuxmap.c
index 5fdf33991..4d238eb3a 100644
--- a/gst/qtmux/gstqtmuxmap.c
+++ b/gst/qtmux/gstqtmuxmap.c
@@ -164,7 +164,8 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
COMMON_VIDEO_CAPS "; "
"image/jpeg, "
COMMON_VIDEO_CAPS_NO_FRAMERATE "; "
- "video/x-qt-part, " COMMON_VIDEO_CAPS),
+ "video/x-vp8, "
+ COMMON_VIDEO_CAPS "; " "video/x-qt-part, " COMMON_VIDEO_CAPS),
GST_STATIC_CAPS (PCM_CAPS_FULL "; "
MP3_CAPS " ; "
AAC_CAPS " ; "