Changeset 219 for libmpc/branches/r2d/libmpcdec/mpc_bits_reader.c

Timestamp:

02/17/07 16:14:53 (18 years ago)

Author:

r2d

Message:

• speed improvements (mainly inlining)

File:

• libmpc/branches/r2d/libmpcdec/mpc_bits_reader.c (modified) (6 diffs)

libmpc/branches/r2d/libmpcdec/mpc_bits_reader.c

@@ -1 +1 @@
 /*
-  Copyright (c) 2005, The Musepack Development Team
+  Copyright (c) 2007, The Musepack Development Team
   All rights reserved.
 
@@ -36 +36 @@
 #include "internal.h"
 #include "huffman.h"
+#include "mpc_bits_reader.h"
 
-#define MAX_ENUM 32
-
-static const mpc_uint32_t Cnk[MAX_ENUM / 2][MAX_ENUM] =
+const mpc_uint32_t Cnk[MAX_ENUM / 2][MAX_ENUM] =
 {
         {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
@@ -59 +58 @@
 };
 
-static const mpc_uint8_t Cnk_len[MAX_ENUM / 2][MAX_ENUM] =
+const mpc_uint8_t Cnk_len[MAX_ENUM / 2][MAX_ENUM] =
 {
         {0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5},
@@ -80 +79 @@
 };
 
-static const mpc_uint32_t Cnk_lost[MAX_ENUM / 2][MAX_ENUM] =
+const mpc_uint32_t Cnk_lost[MAX_ENUM / 2][MAX_ENUM] =
 {
         {0, 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},
@@ -105 +104 @@
 static const mpc_uint8_t log2_lost[32] =
 { 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_uint64_t ret = r->buff[0];
-
-        while(nb_bits > r->count){
-                r->buff++;
-                ret = (ret << 8) | r->buff[0];
-                r->count += 8;
-        }
-
-        r->count -= nb_bits;
-
-        return (mpc_uint32_t)((ret >> r->count) & (-1u >> (32 - nb_bits)));
-}
-
-// basic huffman decoding routine
-// works with maximum lengths up to 16
-mpc_int32_t mpc_bits_huff_dec(mpc_bits_reader * r, const mpc_huffman *Table)
-{
-    int tmp; mpc_uint32_t code;
-    code = ((r->buff[0] << 16) | (r->buff[1] << 8) | r->buff[2])
-                        << (16 - r->count);
-
-        while (code < Table->Code) Table++;
-
-        tmp = r->count - Table->Length;
-        r->buff -= tmp >> 3;
-        r->count = tmp & 0x07;
-
-        return Table->Value;
-}
 
 mpc_int32_t mpc_bits_golomb_dec(mpc_bits_reader * r, const mpc_uint_t k)
@@ -166 +132 @@
 
         return (l << k) | ((code >> r->count) & ((1 << k) - 1));
-}
-
-mpc_uint32_t mpc_bits_enum_dec(mpc_bits_reader * r, mpc_uint_t k, mpc_uint_t n)
-{
-        mpc_uint32_t bits = 0;
-        mpc_uint32_t code;
-        const mpc_uint32_t * C = Cnk[k-1];
-
-        code = mpc_bits_read(r, Cnk_len[k-1][n-1] - 1);
-
-        if (code >= Cnk_lost[k-1][n-1])
-                code = ((code << 1) | mpc_bits_read(r, 1)) - Cnk_lost[k-1][n-1];
-
-        do {
-                n--;
-                if (code >= C[n]) {
-                        bits |= 1 << n;
-                        code -= C[n];
-                        C -= MAX_ENUM;
-                        k--;
-                }
-        } while(k > 0);
-
-        return bits;
 }