From: Andre Noll <maan@systemlinux.org>
Date: Sun, 18 Oct 2009 20:42:21 +0000 (+0200)
Subject: Rename get_bits1() to get_bit().
X-Git-Tag: v0.4.1~56
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=232020d1a15641c8a492c07f79f59df7d4d279ea;hp=7978ce515fc2c19ffd8fd7d8fe356f5fa628d7ff

Rename get_bits1() to get_bit().
---

diff --git a/bitstream.h b/bitstream.h
index 0c0a1eba..88b62f94 100644
--- a/bitstream.h
+++ b/bitstream.h
@@ -53,7 +53,7 @@ static inline unsigned int get_bits(struct getbit_context *gbc, int n)
 }
 
 /* This is rather hot, we can do better than get_bits(gbc, 1). */
-static inline unsigned int get_bits1(struct getbit_context *gbc)
+static inline unsigned int get_bit(struct getbit_context *gbc)
 {
 	int idx = gbc->index++;
 	uint8_t tmp = gbc->buffer[idx >> 3], mask = (1 << (7 - (idx & 7)));
diff --git a/wmadec_filter.c b/wmadec_filter.c
index c181fdf6..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;