From a02611146dcc9eb5aac4b05e4602e58f719076ae Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 1 Jun 2012 10:56:10 +0200 Subject: [PATCH] wma: Remove exponent_sizes[] from struct private_wma_data. This array is only used in compute_scale_factor_band_sizes(), and even there we need only the current value. So it is enough to have a single local variable in this function. --- wmadec_filter.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wmadec_filter.c b/wmadec_filter.c index e58754f5..220dc40c 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -75,7 +75,6 @@ struct private_wmadec_data { int byte_offset_bits; /** Only used if use_exp_vlc is true. */ struct vlc exp_vlc; - int exponent_sizes[BLOCK_NB_SIZES]; uint16_t exponent_bands[BLOCK_NB_SIZES][25]; /** The index of the first coef in high band. */ int high_band_start[BLOCK_NB_SIZES]; @@ -229,8 +228,9 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd, const uint8_t *table; for (k = 0; k < pwd->nb_block_sizes; k++) { - block_len = pwd->frame_len >> k; + int exponent_size; + block_len = pwd->frame_len >> k; table = NULL; a = pwd->frame_len_bits - BLOCK_MIN_BITS - k; if (a < 3) { @@ -245,7 +245,7 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd, n = *table++; for (i = 0; i < n; i++) pwd->exponent_bands[k][i] = table[i]; - pwd->exponent_sizes[k] = n; + exponent_size = n; } else { j = 0; lpos = 0; @@ -262,7 +262,7 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd, break; lpos = pos; } - pwd->exponent_sizes[k] = j; + exponent_size = j; } /* max number of coefs */ @@ -270,7 +270,7 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd, /* high freq computation */ pwd->high_band_start[k] = (int) ((block_len * 2 * high_freq) / ahi->sample_rate + 0.5); - n = pwd->exponent_sizes[k]; + n = exponent_size; j = 0; pos = 0; for (i = 0; i < n; i++) { -- 2.30.2