X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=wmadec_filter.c;h=e41e8c505e88e8cdbd325d1e299ed292c49e488b;hb=232020d1a15641c8a492c07f79f59df7d4d279ea;hp=401dfd2535955681c1085edce795ba59dbed79d0;hpb=a7722850be9f23daf1e095bc9527ba24faa9719b;p=paraslash.git

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 401dfd25..e41e8c50 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -731,10 +731,10 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
 		return -E_INCOHERENT_BLOCK_LEN;
 
 	if (pwd->ahi.channels == 2)
-		pwd->ms_stereo = get_bits1(&pwd->gb);
+		pwd->ms_stereo = get_bit(&pwd->gb);
 	v = 0;
 	for (ch = 0; ch < pwd->ahi.channels; ch++) {
-		int a = get_bits1(&pwd->gb);
+		int a = get_bit(&pwd->gb);
 		pwd->channel_coded[ch] = a;
 		v |= a;
 	}
@@ -770,7 +770,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
 				int i, m, a;
 				m = pwd->exponent_high_sizes[bsize];
 				for (i = 0; i < m; i++) {
-					a = get_bits1(&pwd->gb);
+					a = get_bit(&pwd->gb);
 					pwd->high_band_coded[ch][i] = a;
 					/* if noise coding, the coefficients are not transmitted */
 					if (a)
@@ -814,7 +814,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
 	}
 
 	/* exponents can be reused in short blocks. */
-	if ((pwd->block_len_bits == pwd->frame_len_bits) || get_bits1(&pwd->gb)) {
+	if ((pwd->block_len_bits == pwd->frame_len_bits) || get_bit(&pwd->gb)) {
 		for (ch = 0; ch < pwd->ahi.channels; ch++) {
 			if (pwd->channel_coded[ch]) {
 				if (pwd->use_exp_vlc) {
@@ -867,7 +867,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd)
 					run = run_table[code];
 					level = level_table[code];
 				}
-				sign = get_bits1(&pwd->gb);
+				sign = get_bit(&pwd->gb);
 				if (!sign)
 					level = -level;
 				ptr += run;
@@ -1157,7 +1157,7 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
 		return 0;
 	buf_size = pwd->ahi.block_align;
 	samples = data;
-	init_get_bits(&pwd->gb, buf, buf_size * 8);
+	init_get_bits(&pwd->gb, buf, buf_size);
 	if (pwd->use_bit_reservoir) {
 		/* read super frame header */
 		skip_bits(&pwd->gb, 4);	/* super frame index */
@@ -1187,7 +1187,7 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
 
 			/* XXX: bit_offset bits into last frame */
 			init_get_bits(&pwd->gb, pwd->last_superframe,
-				MAX_CODED_SUPERFRAME_SIZE * 8);
+				MAX_CODED_SUPERFRAME_SIZE);
 			/* skip unused bits */
 			if (pwd->last_bitoffset > 0)
 				skip_bits(&pwd->gb, pwd->last_bitoffset);
@@ -1205,7 +1205,7 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
 		/* read each frame starting from bit_offset */
 		pos = bit_offset + 4 + 4 + pwd->byte_offset_bits + 3;
 		init_get_bits(&pwd->gb, buf + (pos >> 3),
-			(MAX_CODED_SUPERFRAME_SIZE - (pos >> 3)) * 8);
+			(MAX_CODED_SUPERFRAME_SIZE - (pos >> 3)));
 		len = pos & 7;
 		if (len > 0)
 			skip_bits(&pwd->gb, len);