[FFmpeg-cvslog] r23099 - trunk/libavcodec/mpegaudiodec.c

[michael]

Author: michael
Date: Tue May 11 23:31:54 2010
New Revision: 23099

Log:
Do the same sign flip optimization to the low freq decoder.
as with the high freq 10-20 cycles faster

Modified:
   trunk/libavcodec/mpegaudiodec.c

Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c	Tue May 11 23:20:33 2010	(r23098)
+++ trunk/libavcodec/mpegaudiodec.c	Tue May 11 23:31:54 2010	(r23099)
@@ -1454,7 +1454,7 @@ static int huffman_decode(MPADecodeConte
         /* read huffcode and compute each couple */
         for(;j>0;j--) {
             int exponent, x, y;
-            INTFLOAT v;
+            int v;
             int pos= get_bits_count(&s->gb);
 
             if (pos >= end_pos){
@@ -1481,37 +1481,36 @@ static int huffman_decode(MPADecodeConte
                 x = y >> 5;
                 y = y & 0x0f;
                 if (x < 15){
-                    v = RENAME(expval_table)[ exponent ][ x ];
-//                      v = RENAME(expval_table)[ (exponent&3) ][ x ] >> FFMIN(0 - (exponent>>2), 31);
+                    READ_FLIP_SIGN(g->sb_hybrid+s_index, RENAME(expval_table)[ exponent ]+x)
                 }else{
                     x += get_bitsz(&s->gb, linbits);
                     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){
-                    v = RENAME(expval_table)[ exponent ][ y ];
+                    READ_FLIP_SIGN(g->sb_hybrid+s_index+1, RENAME(expval_table)[ exponent ]+y)
                 }else{
                     y += get_bitsz(&s->gb, linbits);
                     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{
                 x = y >> 5;
                 y = y & 0x0f;
                 x += y;
                 if (x < 15){
-                    v = RENAME(expval_table)[ exponent ][ x ];
+                    READ_FLIP_SIGN(g->sb_hybrid+s_index+!!y, RENAME(expval_table)[ exponent ]+x)
                 }else{
                     x += get_bitsz(&s->gb, linbits);
                     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;
             }
             s_index+=2;