[FFmpeg-soc] [soc]: r266 - aac/aac.c

[banan]

Author: banan
Date: Sun Jun 24 19:58:32 2007
New Revision: 266

Log:
Added scalebias. Should fix simd vs float scalings.


Modified:
   aac/aac.c

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Sun Jun 24 19:58:32 2007
@@ -345,7 +345,7 @@ typedef struct {
 
     //bias values
     int add_bias;
-    int exp_bias;
+    int scale_bias;
 
     // statistics
     int num_frame;
@@ -834,15 +834,13 @@ static int aac_decode_init(AVCodecContex
 
     if(ac->dsp.float_to_int16 == ff_float_to_int16_c) {
         ac->add_bias = 385;
-        ac->exp_bias = 0;
-        for (i = 0; i < 256; i++)
-            ac->pow2sf_tab[i] = pow(2, (i - 100)/4.) /1024./32768.;
+        ac->scale_bias = 32768;
     } else {
         ac->add_bias = 0;
-        ac->exp_bias = 15<<23;
-        for (i = 0; i < 256; i++)
-            ac->pow2sf_tab[i] = pow(2, (i - 100)/4.) /1024.;
+        ac->scale_bias = 1;
     }
+    for (i = 0; i < 256; i++)
+        ac->pow2sf_tab[i] = pow(2, (i - 100)/4.) /1024./ac->scale_bias;
 
 
     // general init
@@ -915,7 +913,7 @@ static void ltp_data(AACContext * ac, Ge
         assert(0);
     } else {
         ltp->lag = get_bits(gb, 11);
-        ltp->coef = ltp_coef[get_bits(gb, 3)] * (-2./32768./1024.); // wrong mdct method
+        ltp->coef = ltp_coef[get_bits(gb, 3)] * (-2./ac->scale_bias/1024.); // wrong mdct method
         for (sfb = 0; sfb < FFMIN(max_sfb, MAX_LTP_LONG_SFB); sfb++)
             ltp->used[sfb] = get_bits1(gb);
     }
@@ -1031,7 +1029,7 @@ static void scale_factor_data(AACContext
                 } else {
                     noise += get_vlc2(gb, ac->mainvlc.table, 7, 3) - 60;
                 }
-                sf[g][i] = pow(2.0, 0.25 * noise)/1024./32768.;
+                sf[g][i] = pow(2.0, 0.25 * noise)/1024./ac->scale_bias;
             } else {
                 global_gain += get_vlc2(gb, ac->mainvlc.table, 7, 3) - 60;
                 assert(!(global_gain & (~255)));