From 28ff4defb9b2fd3c3e87ae68821b8c0c6e694b9a Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sat, 7 Nov 2009 18:56:46 +0100 Subject: [PATCH] Kill pwd->coefs_start. It is always zero. --- wmadec_filter.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/wmadec_filter.c b/wmadec_filter.c index 7479e84c..802cb825 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -75,7 +75,6 @@ struct private_wmadec_data { uint16_t exponent_bands[BLOCK_NB_SIZES][25]; /** The index of the first coef in high band. */ int high_band_start[BLOCK_NB_SIZES]; - int coefs_start;///< first coded coef int coefs_end[BLOCK_NB_SIZES]; ///< max number of coded coefficients int exponent_high_sizes[BLOCK_NB_SIZES]; int exponent_high_bands[BLOCK_NB_SIZES][HIGH_BAND_MAX_SIZE]; @@ -213,7 +212,6 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd, int a, b, pos, lpos, k, block_len, i, j, n; const uint8_t *table; - pwd->coefs_start = 0; for (k = 0; k < pwd->nb_block_sizes; k++) { block_len = pwd->frame_len >> k; @@ -750,8 +748,6 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd, coefs = pwd->coefs[ch]; if (!pwd->use_noise_coding) { /* XXX: optimize more */ - for (i = 0; i < pwd->coefs_start; i++) - *coefs++ = 0.0; n = nb_coefs[ch]; for (i = 0; i < n; i++) *coefs++ = coefs1[i] * @@ -762,13 +758,6 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd, continue; } mult1 = mult; - /* very low freqs: noise */ - for (i = 0; i < pwd->coefs_start; i++) { - *coefs++ = pwd->noise_table[pwd->noise_index] * - exponents[i << bsize >> esize] * mult1; - pwd->noise_index = (pwd->noise_index + 1) & - (NOISE_TAB_SIZE - 1); - } n1 = pwd->exponent_high_sizes[bsize]; /* compute power of high bands */ exponents = pwd->exponents[ch] + @@ -790,11 +779,10 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd, exponents += n << bsize; } /* main freqs and high freqs */ - exponents = pwd->exponents[ch] + (pwd->coefs_start << bsize); + exponents = pwd->exponents[ch]; for (j = -1; j < n1; j++) { if (j < 0) - n = pwd->high_band_start[bsize] - - pwd->coefs_start; + n = pwd->high_band_start[bsize]; else n = pwd->exponent_high_bands[pwd->frame_len_bits - pwd->block_len_bits][j]; @@ -915,7 +903,7 @@ static int wma_decode_block(struct private_wmadec_data *pwd) coef_nb_bits = wma_total_gain_to_bits(total_gain); /* compute number of coefficients */ - n = pwd->coefs_end[bsize] - pwd->coefs_start; + n = pwd->coefs_end[bsize]; for (ch = 0; ch < pwd->ahi.channels; ch++) nb_coefs[ch] = n; -- 2.39.5