From: Andre Noll <maan@systemlinux.org>
Date: Sun, 18 Oct 2009 13:16:14 +0000 (+0200)
Subject: Kill codes_wrap parameter from init_vlc().
X-Git-Tag: v0.4.1~72
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=3231d60840731fa0197e765a5e0dfa707ec3746a

Kill codes_wrap parameter from init_vlc().
---

diff --git a/bitstream.c b/bitstream.c
index e9f7126e..e6360e6a 100644
--- a/bitstream.c
+++ b/bitstream.c
@@ -27,9 +27,9 @@
 #include "wma.h"
 #include "bitstream.h"
 
-#define GET_DATA(v, table, i, wrap, size) \
+#define GET_DATA(v, table, i, size) \
 {\
-	const uint8_t *ptr = (const uint8_t *)table + i * wrap; \
+	const uint8_t *ptr = (const uint8_t *)table + i * size; \
 	switch (size) { \
 	case 1: \
 		v = *(const uint8_t *)ptr; \
@@ -54,8 +54,8 @@ static void alloc_table(struct vlc *vlc, int size)
 }
 
 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)
+		const void *bits, const void *codes, int codes_size,
+		uint32_t code_prefix, int n_prefix)
 {
 	int i, j, k, n, table_size, table_index, nb, n1, idx, code_prefix2,
 		symbol;
@@ -74,8 +74,8 @@ static int build_table(struct vlc *vlc, int table_nb_bits, int nb_codes,
 
 	/* map codes and compute auxillary table sizes */
 	for (i = 0; i < nb_codes; i++) {
-		GET_DATA(n, bits, i, 1, 1);
-		GET_DATA(code, codes, i, codes_wrap, codes_size);
+		GET_DATA(n, bits, i, 1);
+		GET_DATA(code, codes, i, codes_size);
 		/* we accept tables with holes */
 		if (n <= 0)
 			continue;
@@ -118,9 +118,8 @@ static int build_table(struct vlc *vlc, int table_nb_bits, int nb_codes,
 				n = table_nb_bits;
 				table[i][1] = -n;	//bits
 			}
-			idx = build_table(vlc, n, nb_codes,
-				bits, codes, codes_wrap, codes_size,
-				(code_prefix << table_nb_bits) | i,
+			idx = build_table(vlc, n, nb_codes, bits, codes,
+				codes_size, (code_prefix << table_nb_bits) | i,
 				n_prefix + table_nb_bits);
 			/* vlc->table might have changed */
 			table = &vlc->table[table_index];
@@ -140,24 +139,17 @@ static int build_table(struct vlc *vlc, int table_nb_bits, int nb_codes,
  *
  * \param nb_codes Number of vlcs codes.
  *
- * \param bits Table which gives the size (in bits) of each
- * vlc code.
+ * \param bits Table which gives the size (in bits) of each vlc code.
  *
- * \param codes Table which gives the bit pattern of of each
- * vlc code.
+ * \param codes Table which gives the bit pattern of of each vlc code.
  *
- * \param codes_wrap The number of bytes between each entry of the
- * 'codes' tables.
- *
- * \param codes_size The number of bytes of each entry of the
- * 'codes' tables.
+ * \param codes_size The number of bytes of each entry of the \a 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.
  */
-void init_vlc(struct vlc *vlc, int nb_bits, int nb_codes,
-		const void *bits, const void *codes, int codes_wrap,
-		int codes_size)
+void init_vlc(struct vlc *vlc, int nb_bits, int nb_codes, const void *bits,
+		const void *codes, int codes_size)
 {
 	PARA_INFO_LOG("nb_codes: %d\n", nb_codes);
 	vlc->bits = nb_bits;
@@ -165,7 +157,7 @@ void init_vlc(struct vlc *vlc, int nb_bits, int nb_codes,
 	vlc->table_allocated = 0;
 	vlc->table_size = 0;
 	build_table(vlc, nb_bits, nb_codes, bits,
-		codes, codes_wrap, codes_size, 0, 0);
+		codes, codes_size, 0, 0);
 }
 
 void free_vlc(struct vlc *vlc)
diff --git a/bitstream.h b/bitstream.h
index a82dcd72..f8f1b49b 100644
--- a/bitstream.h
+++ b/bitstream.h
@@ -161,9 +161,8 @@ static inline void init_get_bits(struct getbit_context *s,
 	s->index = 0;
 }
 
-void init_vlc(struct vlc *vlc, int nb_bits, int nb_codes,
-		const void *bits, const void *codes, int codes_wrap,
-		int codes_size);
+void init_vlc(struct vlc *vlc, int nb_bits, int nb_codes, const void *bits,
+		const void *codes, int codes_size);
 
 void free_vlc(struct vlc *vlc);
 
diff --git a/wmadec_filter.c b/wmadec_filter.c
index c7403c3d..d79df975 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, table_codes, 4, 4);
+	init_vlc(vlc, VLCBITS, n, table_bits, table_codes, 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,
-			ff_wma_hgain_huffcodes, 2, 2);
+			ff_wma_hgain_huffcodes, 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,
-		ff_wma_scale_huffcodes, 4, 4);
+		ff_wma_scale_huffcodes, 4);
 	} else {
 		PARA_INFO_LOG("using curve\n");
 		wma_lsp_to_curve_init(pwd, pwd->frame_len);