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

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
This commit is contained in:
Maxim Poliakovski 2010-06-10 17:31:12 +00:00
parent c1b85795cb
commit 79d46cbea6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ivi_common.c
View File

@ -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; base_tab = is_intra ? band->intra_base : band->inter_base;
scale_tab = is_intra ? band->intra_scale : band->inter_scale; scale_tab = is_intra ? band->intra_scale : band->inter_scale;
if (scale_tab)
quant = scale_tab[quant];
if (!is_intra) { if (!is_intra) {
mv_x = mb->mv_x; mv_x = mb->mv_x;
@ -415,7 +417,7 @@ int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile)
if (IVI_DEBUG && !val) if (IVI_DEBUG && !val)
av_log(NULL, AV_LOG_ERROR, "Val = 0 encountered!\n"); 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) if (q > 1)
val = val * q + FFSIGN(val) * (((q ^ 1) - 1) >> 1); val = val * q + FFSIGN(val) * (((q ^ 1) - 1) >> 1);
trvec[pos] = val; trvec[pos] = val;