Changeset 179 for libmpc/branches/r2d/libmpcdec

Timestamp:

12/20/06 20:42:30 (18 years ago)

Author:

r2d

Message:

• bugfix

Location:

libmpc/branches/r2d/libmpcdec

Files:

• mpc_bits_reader.c (modified) (2 diffs)
• mpc_decoder.c (modified) (3 diffs)

libmpc/branches/r2d/libmpcdec/mpc_bits_reader.c

@@ -106 +106 @@
 { 0, 1, 0, 3, 2, 1, 0, 7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 31};
 
+// FIXME : make it work without 64 bit use for 32 bit output
 mpc_uint32_t mpc_bits_read(mpc_bits_reader * r, const unsigned int nb_bits)
 {
-        mpc_uint32_t ret = r->buff[0];
+        mpc_uint64_t ret = r->buff[0];
 
         while(nb_bits > r->count){
@@ -118 +119 @@
         r->count -= nb_bits;
 
-        return (ret >> r->count) & (-1u >> (32 - nb_bits));
+        return (mpc_uint32_t)((ret >> r->count) & (-1u >> (32 - nb_bits)));
 }
 

libmpc/branches/r2d/libmpcdec/mpc_decoder.c

@@ -516 +516 @@
 
         if (is_key_frame == MPC_TRUE) {
-                Max_used_Band = mpc_bits_log_dec(r, d->max_band);
+                Max_used_Band = mpc_bits_log_dec(r, d->max_band + 1);
         } else {
                 Max_used_Band = d->last_max_band + mpc_bits_huff_dec(r, mpc_table_HuffBands);
@@ -626 +626 @@
                                         }
                                         break;
+                                case 0:
+                                        break;
                                 case 1:
                                         Table = mpc_table_HuffQ_8 [0][0];
@@ -680 +682 @@
                                         }
                                         break;
-                                case 9: case 10: case 11: case 12: case 13: case 14: case 15:
+                                default :
                                         for ( ; k < 36; k++ ) {
                                                 q[k] = mpc_bits_huff_dec(r, mpc_table_HuffQ9up_8);