Changeset 359 for libmpc/trunk/libmpcdec

Timestamp:

10/02/07 12:20:18 (17 years ago)

Author:

r2d

Message:

changed mpc_quantizer size

Location:

libmpc/trunk/libmpcdec

Files:

• mpc_decoder.c (modified) (3 diffs)
• requant.c (modified) (2 diffs)
• requant.h (modified) (1 diff)

libmpc/trunk/libmpcdec/mpc_decoder.c

@@ -205 +205 @@
     MPC_SAMPLE_FORMAT* YL;
     MPC_SAMPLE_FORMAT* YR;
-    mpc_int32_t*    L;
-    mpc_int32_t*    R;
+    mpc_int16_t*    L;
+    mpc_int16_t*    R;
         const mpc_int32_t Last_Band = d->max_band;
 
@@ -453 +453 @@
     /***************************** Samples ****************************/
     for ( n = 0; n < Max_used_Band; n++ ) {
-                mpc_int32_t *q = d->Q[n].L, Res = d->Res_L[n];
+                mpc_int16_t *q = d->Q[n].L, Res = d->Res_L[n];
                 do {
                         mpc_int32_t k;
@@ -615 +615 @@
         /***************************** Samples ****************************/
         for ( n = 0; n < Max_used_Band; n++ ) {
-                mpc_int32_t *q = d->Q[n].L, Res = d->Res_L[n];
+                mpc_int16_t *q = d->Q[n].L, Res = d->Res_L[n];
                 static const unsigned int thres[] = {0, 0, 3, 0, 0, 1, 3, 4, 8};
                 static const mpc_int8_t HuffQ2_var[5*5*5] =

libmpc/trunk/libmpcdec/requant.c

@@ -43 +43 @@
 /* C O N S T A N T S */
 // Bits per sample for chosen quantizer
-const mpc_uint32_t  Res_bit [18] = {
+const mpc_uint8_t  Res_bit [18] = {
     0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16
 };
@@ -65 +65 @@
 // Requantization offset
 // 2*D+1 = steps of quantizer
-const mpc_int32_t  __Dc [1 + 18] = {
+const mpc_int16_t  __Dc [1 + 18] = {
       2,
       0,     1,     2,     3,     4,     7,    15,    31,    63,

libmpc/trunk/libmpcdec/requant.h

@@ -48 +48 @@
 
 /* C O N S T A N T S */
-const mpc_uint32_t      Res_bit [18];     ///< Bits per sample for chosen quantizer
+const mpc_uint8_t      Res_bit [18];     ///< Bits per sample for chosen quantizer
 const MPC_SAMPLE_FORMAT __Cc    [1 + 18]; ///< Requantization coefficients
-const mpc_int32_t       __Dc    [1 + 18]; ///< Requantization offset
+const mpc_int16_t       __Dc    [1 + 18]; ///< Requantization offset
 
 #define Cc (__Cc + 1)