mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-19 23:06:49 +00:00
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 :(
This commit is contained in:
parent
4ec81ff7fa
commit
e72a376411
4 changed files with 15 additions and 3 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
2006-01-23 Edward Hervey <edward@fluendo.com>
|
||||||
|
|
||||||
|
* 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)
|
2006-01-20 Martin Zlomek from Itonis (michael.benes@xeris.cz)
|
||||||
|
|
||||||
reviewed by: Edward Hervey <edward@fluendo.com>
|
reviewed by: Edward Hervey <edward@fluendo.com>
|
||||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit e0b121388ece524c0b7035a72bddd191d122d8bf
|
Subproject commit bc4325349e8d0ec90aa5c5e74566880cc2e82527
|
|
@ -528,10 +528,13 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
|
||||||
caps = GST_FF_VID_CAPS_NEW ("image/png", NULL);
|
caps = GST_FF_VID_CAPS_NEW ("image/png", NULL);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case CODEC_ID_SMC:
|
||||||
|
caps = GST_FF_VID_CAPS_NEW ("video/x-smc", NULL);
|
||||||
|
break;
|
||||||
|
|
||||||
case CODEC_ID_WS_VQA:
|
case CODEC_ID_WS_VQA:
|
||||||
case CODEC_ID_IDCIN:
|
case CODEC_ID_IDCIN:
|
||||||
case CODEC_ID_8BPS:
|
case CODEC_ID_8BPS:
|
||||||
case CODEC_ID_SMC:
|
|
||||||
case CODEC_ID_FLIC:
|
case CODEC_ID_FLIC:
|
||||||
case CODEC_ID_VMDVIDEO:
|
case CODEC_ID_VMDVIDEO:
|
||||||
case CODEC_ID_VMDAUDIO:
|
case CODEC_ID_VMDAUDIO:
|
||||||
|
|
|
@ -821,7 +821,8 @@ gst_ffmpegdec_frame (GstFFMpegDec * ffmpegdec,
|
||||||
iskeyframe = ( is_itype || is_reference )
|
iskeyframe = ( is_itype || is_reference )
|
||||||
|| (oclass->in_plugin->id == CODEC_ID_INDEO3)
|
|| (oclass->in_plugin->id == CODEC_ID_INDEO3)
|
||||||
|| (oclass->in_plugin->id == CODEC_ID_MSZH)
|
|| (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,
|
GST_DEBUG_OBJECT (ffmpegdec,
|
||||||
"Decoded video: len=%d, have_data=%d, is_keyframe:%d, is_itype:%d, is_reference:%d",
|
"Decoded video: len=%d, have_data=%d, is_keyframe:%d, is_itype:%d, is_reference:%d",
|
||||||
len, have_data, iskeyframe, is_itype, is_reference);
|
len, have_data, iskeyframe, is_itype, is_reference);
|
||||||
|
|
Loading…
Reference in a new issue