Rename get_bits1() to get_bit().
authorAndre Noll <maan@systemlinux.org>
Sun, 18 Oct 2009 20:42:21 +0000 (22:42 +0200)
committerAndre Noll <maan@systemlinux.org>
Wed, 18 Nov 2009 18:34:24 +0000 (19:34 +0100)
bitstream.h
wmadec_filter.c

index 0c0a1eb..88b62f9 100644 (file)
@@ -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)));
index c181fdf..e41e8c5 100644 (file)
@@ -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;