# HG changeset patch # User lorenm # Date 1218670228 0 # Node ID be6d3164312895270cc6bfb37ac9a076ac3dd5b4 # Parent 0dc289443426c93648a29f90d2f97a1249b92fc4 oops, non-normalized downmix to mono contaminated add_bias for non-simd float-to-int. diff -r 0dc289443426 -r be6d31643128 ac3dec.c --- a/ac3dec.c Wed Aug 13 19:43:18 2008 +0000 +++ b/ac3dec.c Wed Aug 13 23:30:28 2008 +0000 @@ -606,6 +606,9 @@ static inline void do_imdct(AC3DecodeContext *s, int channels) { int ch; + float add_bias = s->add_bias; + if(s->out_channels==1 && channels>1) + add_bias *= LEVEL_MINUS_3DB; // compensate for the gain in downmix for (ch=1; ch<=channels; ch++) { if (s->block_switch[ch]) { @@ -614,13 +617,13 @@ for(i=0; i<128; i++) x[i] = s->transform_coeffs[ch][2*i]; ff_imdct_half(&s->imdct_256, s->tmp_output, x); - s->dsp.vector_fmul_window(s->output[ch-1], s->delay[ch-1], s->tmp_output, s->window, s->add_bias, 128); + s->dsp.vector_fmul_window(s->output[ch-1], s->delay[ch-1], s->tmp_output, s->window, add_bias, 128); for(i=0; i<128; i++) x[i] = s->transform_coeffs[ch][2*i+1]; ff_imdct_half(&s->imdct_256, s->delay[ch-1], x); } else { ff_imdct_half(&s->imdct_512, s->tmp_output, s->transform_coeffs[ch]); - s->dsp.vector_fmul_window(s->output[ch-1], s->delay[ch-1], s->tmp_output, s->window, s->add_bias, 128); + s->dsp.vector_fmul_window(s->output[ch-1], s->delay[ch-1], s->tmp_output, s->window, add_bias, 128); memcpy(s->delay[ch-1], s->tmp_output+128, 128*sizeof(float)); } }