Changeset 310 for libmpc/trunk/libmpcdec

Timestamp:

05/04/07 14:10:51 (18 years ago)

Author:

r2d

Message:

• corrected a M/S bug in sv8 decoding
• changed Max_used_band usage in sv7 decoding, so it as the same meaning as in sv8 decoding

Location:

libmpc/trunk/libmpcdec

Files:

• mpc_bits_reader.h (modified) (2 diffs)
• mpc_decoder.c (modified) (5 diffs)
• streaminfo.c (modified) (2 diffs)

libmpc/trunk/libmpcdec/mpc_bits_reader.h

@@ -44 +44 @@
 extern const mpc_uint32_t Cnk_lost[MAX_ENUM / 2][MAX_ENUM];
 
+// can read up to 31 bits
 static mpc_inline mpc_uint32_t mpc_bits_read(mpc_bits_reader * r, const unsigned int nb_bits)
 {
@@ -58 +59 @@
         }
 
-        return ret & (-1u >> (32 - nb_bits));
+        return ret & ((1 << nb_bits) - 1);
 }
 

libmpc/trunk/libmpcdec/mpc_decoder.c

@@ -369 +369 @@
         d->Res_L[0] = mpc_bits_read(r, 4);
         d->Res_R[0] = mpc_bits_read(r, 4);
-        if (d->ms && !(d->Res_L[0] == 0 && d->Res_R[0] == 0))
-        d->MS_Flag[0] = mpc_bits_read(r, 1);
+        if (!(d->Res_L[0] == 0 && d->Res_R[0] == 0)) {
+                if (d->ms)
+                d->MS_Flag[0] = mpc_bits_read(r, 1);
+                Max_used_Band = 1;
+        }
 
     // consecutive subbands
@@ -383 +386 @@
                         if (d->ms)
                 d->MS_Flag[n] = mpc_bits_read(r, 1);
-                        Max_used_Band = n;
+                        Max_used_Band = n + 1;
                 }
     }
+
     /****************************** SCFI ******************************/
-    for ( n = 0; n <= Max_used_Band; n++ ) {
+    for ( n = 0; n < Max_used_Band; n++ ) {
                 if (d->Res_L[n])
                         d->SCFI_L[n] = mpc_bits_huff_dec(r, mpc_table_HuffSCFI);
@@ -395 +399 @@
 
     /**************************** SCF/DSCF ****************************/
-    for ( n = 0; n <= Max_used_Band; n++ ) {
+    for ( n = 0; n < Max_used_Band; n++ ) {
                 mpc_int32_t * SCF = d->SCF_Index_L[n];
                 mpc_uint32_t Res  = d->Res_L[n], SCFI = d->SCFI_L[n];
@@ -448 +452 @@
 
     /***************************** Samples ****************************/
-    for ( n = 0; n <= Max_used_Band; n++ ) {
+    for ( n = 0; n < Max_used_Band; n++ ) {
                 mpc_int32_t *q = d->Q[n].L, Res = d->Res_L[n];
                 do {
@@ -554 +558 @@
         for( n = Max_used_Band; n <= d->max_band; n++)
                 d->Res_L[n] = d->Res_R[n] = 0;
-
-
 
         /****************************** SCFI ******************************/

libmpc/trunk/libmpcdec/streaminfo.c

@@ -105 +105 @@
 
         si->bitrate            = 0;
-        frames                 = mpc_bits_read(r, 32);
+        frames                 = (mpc_bits_read(r, 16) << 16) | mpc_bits_read(r, 16);
         mpc_bits_read(r, 1); // intensity stereo : should be 0
         si->ms                 = mpc_bits_read(r, 1);
@@ -185 +185 @@
         mpc_bits_reader r = *r_in;
 
-        CRC = mpc_bits_read(&r, 32);
+        CRC = (mpc_bits_read(&r, 16) << 16) | mpc_bits_read(&r, 16);
         if (CRC != crc32(r.buff + 1 - (r.count >> 3), (int)block_size - 4))
                 return MPC_STATUS_FILE;