Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do the same sign flip optimization to the low freq decoder.

Browse Source 
as with the high freq 10-20 cycles faster

Originally committed as revision 23099 to svn://svn.ffmpeg.org/ffmpeg/trunk
oldabi
Michael Niedermayer 15 years ago
parent 4b070a7a61
commit 3b7117b73a
1 changed files with 13 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      libavcodec/mpegaudiodec.c

27
libavcodec/mpegaudiodec.c
Unescape View File

@ -1454,7 +1454,7 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g,
/* read huffcode and compute each couple */ /* read huffcode and compute each couple */
for(;j>0;j--) { for(;j>0;j--) {
int exponent, x, y; int exponent, x, y;
INTFLOAT v; int v;
int pos= get_bits_count(&s->gb); int pos= get_bits_count(&s->gb);
if (pos >= end_pos){ if (pos >= end_pos){
@ -1481,37 +1481,36 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g,
x = y >> 5; x = y >> 5;
y = y & 0x0f; y = y & 0x0f;
if (x < 15){ if (x < 15){
v = RENAME(expval_table)[ exponent ][ x ]; READ_FLIP_SIGN(g->sb_hybrid+s_index, RENAME(expval_table)[ exponent ]+x)
// v = RENAME(expval_table)[ (exponent&3) ][ x ] >> FFMIN(0 - (exponent>>2), 31);
}else{ }else{
x += get_bitsz(&s->gb, linbits); x += get_bitsz(&s->gb, linbits);
v = l3_unscale(x, exponent); v = l3_unscale(x, exponent);
if (get_bits1(&s->gb))
v = -v;
g->sb_hybrid[s_index] = v;
} }
if (get_bits1(&s->gb))
v = -v;
g->sb_hybrid[s_index] = v;
if (y < 15){ if (y < 15){
v = RENAME(expval_table)[ exponent ][ y ]; READ_FLIP_SIGN(g->sb_hybrid+s_index+1, RENAME(expval_table)[ exponent ]+y)
}else{ }else{
y += get_bitsz(&s->gb, linbits); y += get_bitsz(&s->gb, linbits);
v = l3_unscale(y, exponent); v = l3_unscale(y, exponent);
if (get_bits1(&s->gb))
v = -v;
g->sb_hybrid[s_index+1] = v;
} }
if (get_bits1(&s->gb))
v = -v;
g->sb_hybrid[s_index+1] = v;
}else{ }else{
x = y >> 5; x = y >> 5;
y = y & 0x0f; y = y & 0x0f;
x += y; x += y;
if (x < 15){ if (x < 15){
v = RENAME(expval_table)[ exponent ][ x ]; READ_FLIP_SIGN(g->sb_hybrid+s_index+!!y, RENAME(expval_table)[ exponent ]+x)
}else{ }else{
x += get_bitsz(&s->gb, linbits); x += get_bitsz(&s->gb, linbits);
v = l3_unscale(x, exponent); v = l3_unscale(x, exponent);
if (get_bits1(&s->gb))
v = -v;
g->sb_hybrid[s_index+!!y] = v;
} }
if (get_bits1(&s->gb))
v = -v;
g->sb_hybrid[s_index+!!y] = v;
g->sb_hybrid[s_index+ !y] = 0; g->sb_hybrid[s_index+ !y] = 0;
} }
s_index+=2; s_index+=2;

Write Preview
Loading…
Cancel
Save