Mercurial > libavcodec.hg
changeset 3624:7d8ef3c542a1 libavcodec
avoid reading exponent twice
| author | michael |
|---|---|
| date | Fri, 25 Aug 2006 13:36:27 +0000 |
| parents | d0242f36a793 |
| children | 8042fcb3a62a |
| files | mpegaudiodec.c |
| diffstat | 1 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegaudiodec.c Fri Aug 25 12:26:34 2006 +0000 +++ b/mpegaudiodec.c Fri Aug 25 13:36:27 2006 +0000 @@ -1703,6 +1703,8 @@ /* read huffcode and compute each couple */ for(;j>0;j--) { + int exponent; + if (get_bits_count(&s->gb) >= end_pos) break; y = get_vlc2(&s->gb, vlc->table, 7, 3); @@ -1716,20 +1718,22 @@ x = y >> 4; y = y & 0x0f; + exponent= exponents[s_index]; dprintf("region=%d n=%d x=%d y=%d exp=%d\n", - i, g->region_size[i] - j, x, y, exponents[s_index]); + i, g->region_size[i] - j, x, y, exponent); if (x) { #if 0 if (x == 15) x += get_bitsz(&s->gb, linbits); - v = l3_unscale(x, exponents[s_index]); + v = l3_unscale(x, exponent); #else if (x < 15){ - v = expval_table[ exponents[s_index] + 400 ][ x ]; + v = expval_table[ exponent + 400 ][ x ]; +// v = expval_table[ (exponent&3) + 400 ][ x ] >> FFMIN(0 - (exponent>>2), 31); }else{ x += get_bitsz(&s->gb, linbits); - v = l3_unscale(x, exponents[s_index]); + v = l3_unscale(x, exponent); } #endif if (get_bits1(&s->gb)) @@ -1742,13 +1746,13 @@ #if 0 if (y == 15) y += get_bitsz(&s->gb, linbits); - v = l3_unscale(y, exponents[s_index]); + v = l3_unscale(y, exponent); #else if (y < 15){ - v = expval_table[ exponents[s_index] + 400 ][ y ]; + v = expval_table[ exponent + 400 ][ y ]; }else{ y += get_bitsz(&s->gb, linbits); - v = l3_unscale(y, exponents[s_index]); + v = l3_unscale(y, exponent); } #endif if (get_bits1(&s->gb))