X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=c6eb0b1cad291bce42f3eda474a9a9c62a28c8b3;hp=bb534df528c5278198da5c116eb324bfe099da85;hb=3150a0caa27a34d44556fb77f4a5aebc3d978580;hpb=9417eae5ca2b9f10d25f769221e8fd91048bc68a diff --git a/wmadec_filter.c b/wmadec_filter.c index bb534df5..c6eb0b1c 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -150,7 +150,7 @@ struct private_wmadec_data { #define VLCBITS 9 #define VLCMAX DIV_ROUND_UP(22, VLCBITS) -#define SINE_WINDOW(x) float sine_ ## x[x] __a_aligned(16) +#define SINE_WINDOW(x) static float sine_ ## x[x] __a_aligned(16) SINE_WINDOW(128); SINE_WINDOW(256); @@ -769,7 +769,6 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd, *coefs++ = 0.0; continue; } - mult1 = mult; n1 = pwd->exponent_high_sizes[bsize]; /* compute power of high bands */ exponents = pwd->exponents[ch] + @@ -803,8 +802,7 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd, mult1 = sqrt(exp_power[j] / exp_power[last_high_band]); /* XXX: use a table */ - mult1 = mult1 * pow(10, - pwd->high_band_values[ch][j] * 0.05); + mult1 *= pow(10, pwd->high_band_values[ch][j] * 0.05); mult1 /= (pwd->max_exponent[ch] * pwd->noise_mult); mult1 *= mdct_norm; for (i = 0; i < n; i++) { @@ -1012,7 +1010,6 @@ next: for (ch = 0; ch < pwd->ahi.channels; ch++) { int n4, idx; - n = pwd->block_len; n4 = pwd->block_len / 2; if (pwd->channel_coded[ch]) imdct(pwd->mdct_ctx[bsize], pwd->output, pwd->coefs[ch]);