Simplify alloc_table().

[paraslash.git] / bitstream.c

diff --git a/bitstream.c b/bitstream.c
index c4c465e8a24904347bcc739399a09140734ff6ac..2522b6d4e0a2be6e738fe5f1632c9f788e98a978 100644 (file)
--- a/bitstream.c
+++ b/bitstream.c
@@ -29,40 +29,33 @@
 
 #define GET_DATA(v, table, i, wrap, size) \
 {\
-    const uint8_t *ptr = (const uint8_t *)table + i * wrap;\
-    switch(size) {\
-    case 1:\
-        v = *(const uint8_t *)ptr;\
-        break;\
-    case 2:\
-        v = *(const uint16_t *)ptr;\
-        break;\
-    default:\
-        v = *(const uint32_t *)ptr;\
-        break;\
-    }\
+       const uint8_t *ptr = (const uint8_t *)table + i * wrap; \
+       switch (size) { \
+       case 1: \
+               v = *(const uint8_t *)ptr; \
+               break; \
+       case 2: \
+               v = *(const uint16_t *)ptr; \
+               break; \
+       default: \
+               v = *(const uint32_t *)ptr; \
+               break; \
+       } \
 }
 
-static int alloc_table(struct vlc *vlc, int size)
+static void alloc_table(struct vlc *vlc, int size)
 {
-       int idx;
-
-       idx = vlc->table_size;
        vlc->table_size += size;
        if (vlc->table_size > vlc->table_allocated) {
                vlc->table_allocated += (1 << vlc->bits);
-               vlc->table = realloc(vlc->table,
+               vlc->table = para_realloc(vlc->table,
                        sizeof(VLC_TYPE) * 2 * vlc->table_allocated);
-               if (!vlc->table)
-                       return -E_TABLE_ALLOC;
        }
-       return idx;
 }
 
-static int build_table(struct vlc *vlc, int table_nb_bits,
-               int nb_codes, const void *bits, int bits_wrap, int bits_size,
-               const void *codes, int codes_wrap, int codes_size,
-               uint32_t code_prefix, int n_prefix)
+static int build_table(struct vlc *vlc, int table_nb_bits, int nb_codes,
+               const void *bits, const void *codes, int codes_wrap,
+               int codes_size, uint32_t code_prefix, int n_prefix)
 {
        int ret, i, j, k, n, table_size, table_index, nb, n1, idx, code_prefix2,
                symbol;
@@ -70,10 +63,8 @@ static int build_table(struct vlc *vlc, int table_nb_bits,
        VLC_TYPE(*table)[2];
 
        table_size = 1 << table_nb_bits;
-       ret = alloc_table(vlc, table_size);
-       if (ret < 0)
-               return ret;
-       table_index = ret;
+       table_index = vlc->table_size;
+       alloc_table(vlc, table_size);
        table = &vlc->table[table_index];
 
        for (i = 0; i < table_size; i++) {
@@ -83,7 +74,7 @@ static int build_table(struct vlc *vlc, int table_nb_bits,
 
        /* first pass: map codes and compute auxillary table sizes */
        for (i = 0; i < nb_codes; i++) {
-               GET_DATA(n, bits, i, bits_wrap, bits_size);
+               GET_DATA(n, bits, i, 1, 1);
                GET_DATA(code, codes, i, codes_wrap, codes_size);
                /* we accept tables with holes */
                if (n <= 0)
@@ -126,8 +117,7 @@ static int build_table(struct vlc *vlc, int table_nb_bits,
                                table[i][1] = -n;       //bits
                        }
                        ret = build_table(vlc, n, nb_codes,
-                               bits, bits_wrap, bits_size,
-                               codes, codes_wrap, codes_size,
+                               bits, codes, codes_wrap, codes_size,
                                (code_prefix << table_nb_bits) | i,
                                n_prefix + table_nb_bits);
                        if (ret < 0)
@@ -157,22 +147,18 @@ static int build_table(struct vlc *vlc, int table_nb_bits,
  * \param codes Table which gives the bit pattern of of each
  * vlc code.
  *
- * \param bits_wrap The number of bytes between each entry of the
- * 'bits' or 'codes' tables.
- *
- *
- * \param bits_size The number of bytes of each entry of the
- * 'bits' or 'codes' tables.
+ * \param codes_wrap The number of bytes between each entry of the
+ * 'codes' tables.
  *
- * \param codes_wrap Same as bits_wrap but uses the 'codes' table.
- * \param codes_size Same as bits_size but for the 'codes' table.
+ * \param codes_size The number of bytes of each entry of the
+ * 'codes' tables.
  *
  * The wrap and size parameters allow to use any memory configuration and
  * types (byte/word/long) to store the bits and codes tables.
  */
 int init_vlc(struct vlc *vlc, int nb_bits, int nb_codes,
-               const void *bits, int bits_wrap, int bits_size,
-               const void *codes, int codes_wrap, int codes_size)
+               const void *bits, const void *codes, int codes_wrap,
+               int codes_size)
 {
        int ret;
 
@@ -181,7 +167,7 @@ int init_vlc(struct vlc *vlc, int nb_bits, int nb_codes,
        vlc->table = NULL;
        vlc->table_allocated = 0;
        vlc->table_size = 0;
-       ret = build_table(vlc, nb_bits, nb_codes, bits, bits_wrap, bits_size,
+       ret = build_table(vlc, nb_bits, nb_codes, bits,
                codes, codes_wrap, codes_size, 0, 0);
        if (ret < 0)
                freep(&vlc->table);