Changeset 10 for trunk/src/requant.c

Timestamp:

08/12/06 16:35:51 (18 years ago)

Author:

zorg

Message:

Update to 1.2.3 trunk

File:

• trunk/src/requant.c (modified) (2 diffs)

trunk/src/requant.c

@@ -73 +73 @@
 static mpc_uint32_t find_shift(double fval)
 {
-        mpc_int64_t val = (mpc_int64_t)fval;
+        mpc_int64_t  val = (mpc_int64_t)fval;
+        mpc_uint32_t ptr = 0;
         if (val<0) val = -val;
-        mpc_uint32_t ptr = 0;
         while(val) {val>>=1;ptr++;}
 
@@ -114 +114 @@
 }
 
-static void
-mpc_decoder_quantisierungsmodes(mpc_decoder *d) // conversion: index -> quantizer (bitstream reading)
-{                                               // conversion: quantizer -> index (bitstream writing)
-    mpc_int32_t  Band = 0;
-    mpc_int32_t  i;
-
-    do {
-        d->Q_bit [Band] = 4;
-        for ( i = 0; i < 16-1; i++ )
-            d->Q_res [Band] [i] = i;
-        d->Q_res [Band][i] = 17;
-        Band++;
-    } while ( Band < 11 );
-
-    do {
-        d->Q_bit [Band] = 3;
-        for ( i = 0; i < 8-1; i++ )
-            d->Q_res [Band] [i] = i;
-        d->Q_res [Band] [i] = 17;
-        Band++;
-    } while ( Band < 23 );
-
-    do {
-        d->Q_bit [Band] = 2;
-        for ( i = 0; i < 4-1; i++ )
-            d->Q_res [Band] [i] = i;
-        d->Q_res [Band] [i] = 17;
-        Band++;
-    } while ( Band < 32 );
-}
-
 void
 mpc_decoder_initialisiere_quantisierungstabellen(mpc_decoder *d, double scale_factor) 
 {
-    mpc_decoder_quantisierungsmodes(d);
     mpc_decoder_scale_output(d, scale_factor);
 }