wma_decode_superframe(): Make some variables more local.

[paraslash.git] / wmadec_filter.c

diff --git a/wmadec_filter.c b/wmadec_filter.c
index c181fdf68e189dcaa9616858083c3c0d7e6f9875..2fe69940853b8798da95ef63b819108393d426a7 100644 (file)
--- 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;
@@ -1144,8 +1144,7 @@ static int wma_decode_frame(struct private_wmadec_data *pwd, int16_t *samples)
 static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
                int *data_size, const uint8_t *buf, int buf_size)
 {
-       int ret, nb_frames, bit_offset, i, pos, len;
-       uint8_t *q;
+       int ret;
        int16_t *samples;
        static int frame_count;
 
@@ -1159,6 +1158,9 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
        samples = data;
        init_get_bits(&pwd->gb, buf, buf_size);
        if (pwd->use_bit_reservoir) {
+               int i, nb_frames, bit_offset, pos, len;
+               uint8_t *q;
+
                /* read super frame header */
                skip_bits(&pwd->gb, 4); /* super frame index */
                nb_frames = get_bits(&pwd->gb, 4) - 1;