From e72a376411236e6fce98f086ccf6a9f05ace21fb Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 23 Jan 2006 15:13:29 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegcodecmap.c: Added CODEC_ID_SMC <==> video/x-smc caps Original commit message from CVS: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps): Added CODEC_ID_SMC <==> video/x-smc caps * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame): I hate ffmpeg... no keyframe information at all for VP3, so we have to assume they're all keyframes :( --- ChangeLog | 8 ++++++++ common | 2 +- ext/ffmpeg/gstffmpegcodecmap.c | 5 ++++- ext/ffmpeg/gstffmpegdec.c | 3 ++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9fd532534..962c482650 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-01-23 Edward Hervey + + * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps): + Added CODEC_ID_SMC <==> video/x-smc caps + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame): + I hate ffmpeg... no keyframe information at all for VP3, so we have + to assume they're all keyframes :( + 2006-01-20 Martin Zlomek from Itonis (michael.benes@xeris.cz) reviewed by: Edward Hervey diff --git a/common b/common index e0b121388e..bc4325349e 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e0b121388ece524c0b7035a72bddd191d122d8bf +Subproject commit bc4325349e8d0ec90aa5c5e74566880cc2e82527 diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 4f7e34b71c..9d4162c30c 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -528,10 +528,13 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, caps = GST_FF_VID_CAPS_NEW ("image/png", NULL); break; + case CODEC_ID_SMC: + caps = GST_FF_VID_CAPS_NEW ("video/x-smc", NULL); + break; + case CODEC_ID_WS_VQA: case CODEC_ID_IDCIN: case CODEC_ID_8BPS: - case CODEC_ID_SMC: case CODEC_ID_FLIC: case CODEC_ID_VMDVIDEO: case CODEC_ID_VMDAUDIO: diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index 3270b6dfe5..2c10932910 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -821,7 +821,8 @@ gst_ffmpegdec_frame (GstFFMpegDec * ffmpegdec, iskeyframe = ( is_itype || is_reference ) || (oclass->in_plugin->id == CODEC_ID_INDEO3) || (oclass->in_plugin->id == CODEC_ID_MSZH) - || (oclass->in_plugin->id == CODEC_ID_ZLIB); + || (oclass->in_plugin->id == CODEC_ID_ZLIB) + || (oclass->in_plugin->id == CODEC_ID_VP3); GST_DEBUG_OBJECT (ffmpegdec, "Decoded video: len=%d, have_data=%d, is_keyframe:%d, is_itype:%d, is_reference:%d", len, have_data, iskeyframe, is_itype, is_reference);