X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=bitstream.c;h=dfc1e55e67aced611014fc90b86128e8bd61a457;hp=cf815598e0e24893649f3bc2a1e8782b8557ab07;hb=e0545fd978a9583f9583b9bb35e5c25cb78c78f4;hpb=f167629b3191c57a6b691cd2a6af04a45a74ccb0

diff --git a/bitstream.c b/bitstream.c
index cf815598..dfc1e55e 100644
--- 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) 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. */
@@ -19,23 +19,26 @@
 #include "error.h"
 #include "string.h"
 #include "wma.h"
+#include "portable_io.h"
 #include "bitstream.h"
 
-/** Read an 8, 16, or 32 bit entity from a VLC table. */
-#define GET_DATA(v, table, i, size) \
-{\
-	const uint8_t *ptr = (const uint8_t *)table + i * size; \
-	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 inline uint32_t get_data(const void *table, int i, int size)
+{
+	const uint8_t *ptr = (const uint8_t *)table + i * size;
+	uint32_t v;
+
+	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;
+	}
+	return v;
 }
 
 static void alloc_table(struct vlc *vlc, int size)
@@ -44,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,
-			sizeof(VLC_TYPE) * 2 * vlc->table_allocated);
+			sizeof(int16_t) * 2 * vlc->table_allocated);
 	}
 }
 
@@ -54,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;
-	VLC_TYPE(*table)[2];
+	int16_t (*table)[2];
 
 	table_size = 1 << table_nb_bits;
 	table_index = vlc->table_size;
@@ -68,12 +71,12 @@ static int build_table(struct vlc *vlc, int table_nb_bits, int nb_codes,
 
 	/* map codes and compute auxiliary table sizes */
 	for (i = 0; i < nb_codes; i++) {
-		GET_DATA(n, bits, i, 1);
+		n = get_data(bits, i, 1);
 		/* we accept tables with holes */
 		n -= n_prefix;
 		if (n <= 0)
 			continue;
-		GET_DATA(code, codes, i, codes_size);
+		code = get_data(codes, i, codes_size);
 		/* if code matches the prefix, it is in the table */
 		if ((code >> n) != code_prefix)
 			continue;
@@ -162,36 +165,29 @@ void free_vlc(struct vlc *vlc)
  * 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.
- * \param max_depth The number of times \a bits bits must be read to completely
- * read the longest vlc code = (max_vlc_length + bits - 1) / bits.
- *
- * 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.
  */
-int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits,
-		int max_depth)
+int get_vlc(struct getbit_context *gbc, const struct vlc *vlc)
 {
 	int n, idx, nb_bits, code;
 
-	idx = show_bits(gbc, bits);
-	code = table[idx][0];
-	n = table[idx][1];
-	if (max_depth > 1 && n < 0) {
-		skip_bits(gbc, bits);
+	idx = show_bits(gbc, vlc->bits);
+	code = vlc->table[idx][0];
+	n = vlc->table[idx][1];
+	if (n < 0) {
+		skip_bits(gbc, vlc->bits);
 		nb_bits = -n;
 		idx = show_bits(gbc, nb_bits) + code;
-		code = table[idx][0];
-		n = table[idx][1];
-		if (max_depth > 2 && n < 0) {
+		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;
-			code = table[idx][0];
-			n = table[idx][1];
+			code = vlc->table[idx][0];
+			n = vlc->table[idx][1];
 		}
 	}
 	skip_bits(gbc, n);