server: Fix brown paper bag bug in generic_com_on().

[paraslash.git] / bitstream.c

diff --git a/bitstream.c b/bitstream.c
index 9cd1273cfd578cf89492012b41cf236ecd32a38d..dfc1e55e67aced611014fc90b86128e8bd61a457 100644 (file)
--- a/bitstream.c
+++ b/bitstream.c
@@ -6,9 +6,9 @@
  * Copyright (c) 2000, 2001 Fabrice Bellard
  * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  * alternative bitstream reader & writer by Michael Niedermayer <michaelni@gmx.at>
  * Copyright (c) 2000, 2001 Fabrice Bellard
  * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  * alternative bitstream reader & writer by Michael Niedermayer <michaelni@gmx.at>

+ * Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>

  *
  *

- * Licensed under the GNU Lesser General Public License.
- * For licencing details see COPYING.LIB.
+ * Licensed under the GNU Lesser General Public License. see file COPYING.LIB.

  */
 
 /** \file bitstream.c Bitstream API for the wma decoder. */
  */
 
 /** \file bitstream.c Bitstream API for the wma decoder. */


@@ -47,7 +47,7 @@ static void alloc_table(struct vlc *vlc, int size)
        if (vlc->table_size > vlc->table_allocated) {
                vlc->table_allocated += (1 << vlc->bits);
                vlc->table = para_realloc(vlc->table,
        if (vlc->table_size > vlc->table_allocated) {
                vlc->table_allocated += (1 << vlc->bits);
                vlc->table = para_realloc(vlc->table,

-                       sizeof(VLC_TYPE) * 2 * vlc->table_allocated);
+                       sizeof(int16_t) * 2 * vlc->table_allocated);

        }
 }
 
        }
 }
 


@@ -57,7 +57,7 @@ static int build_table(struct vlc *vlc, int table_nb_bits, int nb_codes,
 {
        int i, j, k, n, table_size, table_index, nb, n1, idx;
        uint32_t code;
 {
        int i, j, k, n, table_size, table_index, nb, n1, idx;
        uint32_t code;

-       VLC_TYPE(*table)[2];
+       int16_t (*table)[2];

 
        table_size = 1 << table_nb_bits;
        table_index = vlc->table_size;
 
        table_size = 1 << table_nb_bits;
        table_index = vlc->table_size;


@@ -165,33 +165,29 @@ void free_vlc(struct vlc *vlc)
  * Parse a vlc code.
  *
  * \param gbc The getbit context structure.
  * Parse a vlc code.
  *
  * \param gbc The getbit context structure.

- * \param table The vlc tables to use.
- * \param bits The number of bits which will be read at once.
- *
- * The \a bits parameter must be identical to the \a nb_bits value supplied to
- * \ref init_vlc().
+ * \param vlc The vlc tables to use.

  *
  * \return The vlc code.
  */
  *
  * \return The vlc code.
  */

-int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits)
+int get_vlc(struct getbit_context *gbc, const struct vlc *vlc)

 {
        int n, idx, nb_bits, code;
 
 {
        int n, idx, nb_bits, code;
 

-       idx = show_bits(gbc, bits);
-       code = table[idx][0];
-       n = table[idx][1];
+       idx = show_bits(gbc, vlc->bits);
+       code = vlc->table[idx][0];
+       n = vlc->table[idx][1];

        if (n < 0) {
        if (n < 0) {

-               skip_bits(gbc, bits);
+               skip_bits(gbc, vlc->bits);

                nb_bits = -n;
                idx = show_bits(gbc, nb_bits) + code;
                nb_bits = -n;
                idx = show_bits(gbc, nb_bits) + code;

-               code = table[idx][0];
-               n = table[idx][1];
+               code = vlc->table[idx][0];
+               n = vlc->table[idx][1];

                if (n < 0) {
                        skip_bits(gbc, nb_bits);
                        nb_bits = -n;
                        idx = show_bits(gbc, nb_bits) + code;
                if (n < 0) {
                        skip_bits(gbc, nb_bits);
                        nb_bits = -n;
                        idx = show_bits(gbc, nb_bits) + code;

-                       code = table[idx][0];
-                       n = table[idx][1];
+                       code = vlc->table[idx][0];
+                       n = vlc->table[idx][1];

                }
        }
        skip_bits(gbc, n);
                }
        }
        skip_bits(gbc, n);