RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

indeo4: handle frame type 1 properly 

It turns out that this frame type is actually intra and should be used as
a reference for interframes too.
This commit is contained in:
Kostya Shishkov 2012-06-06 20:13:07 +02:00
parent 03e098e7a0
commit e1a3fa5d3a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/indeo4.c
View File

@ -40,7 +40,7 @@
*/ */
enum { enum {
FRAMETYPE_INTRA = 0, FRAMETYPE_INTRA = 0,
FRAMETYPE_BIDIR1 = 1, ///< bidirectional frame FRAMETYPE_INTRA1 = 1, ///< intra frame with slightly different bitstream coding
FRAMETYPE_INTER = 2, ///< non-droppable P-frame FRAMETYPE_INTER = 2, ///< non-droppable P-frame
FRAMETYPE_BIDIR = 3, ///< bidirectional frame FRAMETYPE_BIDIR = 3, ///< bidirectional frame
FRAMETYPE_INTER_NOREF = 4, ///< droppable P-frame FRAMETYPE_INTER_NOREF = 4, ///< droppable P-frame
@ -133,8 +133,7 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
} }
#if IVI4_STREAM_ANALYSER #if IVI4_STREAM_ANALYSER
if ( ctx->frame_type == FRAMETYPE_BIDIR1 if (ctx->frame_type == FRAMETYPE_BIDIR)
|| ctx->frame_type == FRAMETYPE_BIDIR)
ctx->has_b_frames = 1; ctx->has_b_frames = 1;
#endif #endif
@ -471,7 +470,8 @@ static int decode_mb_info(IVI45DecContext *ctx, IVIBandDesc *band,
} else { } else {
if (band->inherit_mv) { if (band->inherit_mv) {
mb->type = ref_mb->type; /* copy mb_type from corresponding reference mb */ mb->type = ref_mb->type; /* copy mb_type from corresponding reference mb */
} else if (ctx->frame_type == FRAMETYPE_INTRA) { } else if (ctx->frame_type == FRAMETYPE_INTRA ||
ctx->frame_type == FRAMETYPE_INTRA1) {
mb->type = 0; /* mb_type is always INTRA for intra-frames */ mb->type = 0; /* mb_type is always INTRA for intra-frames */
} else { } else {
mb->type = get_bits(&ctx->gb, mb_type_bits); mb->type = get_bits(&ctx->gb, mb_type_bits);
@ -539,6 +539,7 @@ static void switch_buffers(IVI45DecContext *ctx)
{ {
switch (ctx->prev_frame_type) { switch (ctx->prev_frame_type) {
case FRAMETYPE_INTRA: case FRAMETYPE_INTRA:
case FRAMETYPE_INTRA1:
case FRAMETYPE_INTER: case FRAMETYPE_INTER:
ctx->buf_switch ^= 1; ctx->buf_switch ^= 1;
ctx->dst_buf = ctx->buf_switch; ctx->dst_buf = ctx->buf_switch;
@ -550,6 +551,7 @@ static void switch_buffers(IVI45DecContext *ctx)
switch (ctx->frame_type) { switch (ctx->frame_type) {
case FRAMETYPE_INTRA: case FRAMETYPE_INTRA:
case FRAMETYPE_INTRA1:
ctx->buf_switch = 0; ctx->buf_switch = 0;
/* FALLTHROUGH */ /* FALLTHROUGH */
case FRAMETYPE_INTER: case FRAMETYPE_INTER: