From: Andre Noll <maan@systemlinux.org>
Date: Sun, 18 Oct 2009 11:16:12 +0000 (+0200)
Subject: Kill the bits_wrap and bits_size parameters of init_vlc().
X-Git-Tag: v0.4.1~76
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=a4ae014c7b47509d236ddc7a63a3510079470382;p=paraslash.git

Kill the bits_wrap and bits_size parameters of init_vlc().
---

diff --git a/bitstream.c b/bitstream.c
index 23adb2bd..e081d0cf 100644
--- a/bitstream.c
+++ b/bitstream.c
@@ -57,10 +57,9 @@ static int alloc_table(struct vlc *vlc, int size)
 	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;
@@ -81,7 +80,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)
@@ -124,8 +123,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)
@@ -155,22 +153,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 codes_wrap The number of bytes between each entry of the
+ * 'codes' tables.
  *
- * \param bits_size The number of bytes of each entry of the
- * 'bits' or '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;
 
@@ -179,7 +173,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);
diff --git a/bitstream.h b/bitstream.h
index 71d78fcd..7e518c5f 100644
--- a/bitstream.h
+++ b/bitstream.h
@@ -162,8 +162,7 @@ static inline void init_get_bits(struct getbit_context *s,
 }
 
 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);
 
 void free_vlc(struct vlc *vlc);
 
diff --git a/wmadec_filter.c b/wmadec_filter.c
index c0d770d7..c7403c3d 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -183,7 +183,7 @@ static void init_coef_vlc(struct vlc *vlc, uint16_t **prun_table,
 	uint16_t *run_table, *level_table, *int_table;
 	int i, l, j, k, level;
 
-	init_vlc(vlc, VLCBITS, n, table_bits, 1, 1, table_codes, 4, 4);
+	init_vlc(vlc, VLCBITS, n, table_bits, table_codes, 4, 4);
 
 	run_table = para_malloc(n * sizeof(uint16_t));
 	level_table = para_malloc(n * sizeof(uint16_t));
@@ -489,14 +489,14 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat
 		PARA_INFO_LOG("using noise coding\n");
 		init_vlc(&pwd->hgain_vlc, HGAINVLCBITS,
 			sizeof(ff_wma_hgain_huffbits), ff_wma_hgain_huffbits,
-			1, 1, ff_wma_hgain_huffcodes, 2, 2);
+			ff_wma_hgain_huffcodes, 2, 2);
 	}
 
 	if (pwd->use_exp_vlc) {
 		PARA_INFO_LOG("using exp_vlc\n");
 		init_vlc(&pwd->exp_vlc, EXPVLCBITS,
 		sizeof(ff_wma_scale_huffbits), ff_wma_scale_huffbits,
-		1, 1, ff_wma_scale_huffcodes, 4, 4);
+		ff_wma_scale_huffcodes, 4, 4);
 	} else {
 		PARA_INFO_LOG("using curve\n");
 		wma_lsp_to_curve_init(pwd, pwd->frame_len);