From 79d46cbea6c30c11de8da9ca64ac293b773966e2 Mon Sep 17 00:00:00 2001 From: Maxim Poliakovski Date: Thu, 10 Jun 2010 17:31:12 +0000 Subject: [PATCH] Quant changes only once per MB so move the corresponding scale factor assignment out of the block decoding loop. Indeo4 doesn't use any scale table but the quant level itself as scale. Therefore access scale table only if its pointer != NULL. Originally committed as revision 23569 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/ivi_common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index 6a493661d3..f0a3a49464 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -364,6 +364,8 @@ int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile) base_tab = is_intra ? band->intra_base : band->inter_base; scale_tab = is_intra ? band->intra_scale : band->inter_scale; + if (scale_tab) + quant = scale_tab[quant]; if (!is_intra) { mv_x = mb->mv_x; @@ -415,7 +417,7 @@ int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile) if (IVI_DEBUG && !val) av_log(NULL, AV_LOG_ERROR, "Val = 0 encountered!\n"); - q = (base_tab[pos] * scale_tab[quant]) >> 9; + q = (base_tab[pos] * quant) >> 9; if (q > 1) val = val * q + FFSIGN(val) * (((q ^ 1) - 1) >> 1); trvec[pos] = val;