From 87ec849fe9acba075c843e67bcd01f256f481a18 Mon Sep 17 00:00:00 2001 From: Christophe Gisquet Date: Fri, 14 Feb 2014 15:03:06 +0000 Subject: dcadec: remove scaling in lfe_interpolation_fir The scaling factor is constant so it is faster to scale the FIR coefficients in the tables during compilation. Signed-off-by: Janne Grunau --- libavcodec/dcadec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libavcodec/dcadec.c') diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 6c240ee5fd..c251db80a9 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -947,7 +947,7 @@ static void qmf_32_subbands(DCAContext *s, int chans, static void lfe_interpolation_fir(DCAContext *s, int decimation_select, int num_deci_sample, float *samples_in, - float *samples_out, float scale) + float *samples_out) { /* samples_in: An array holding decimated samples. * Samples in current subframe starts from samples_in[0], @@ -971,7 +971,7 @@ static void lfe_interpolation_fir(DCAContext *s, int decimation_select, } /* Interpolation */ for (deciindex = 0; deciindex < num_deci_sample; deciindex++) { - s->dcadsp.lfe_fir[idx](samples_out, samples_in, prCoeff, scale); + s->dcadsp.lfe_fir[idx](samples_out, samples_in, prCoeff); samples_in++; samples_out += 2 * 32 * (1 + idx); } @@ -1265,8 +1265,7 @@ static int dca_filter_channels(DCAContext *s, int block_index) if (s->lfe) { lfe_interpolation_fir(s, s->lfe, 2 * s->lfe, s->lfe_data + 2 * s->lfe * (block_index + 4), - s->samples_chanptr[dca_lfe_index[s->amode]], - 1.0 / (256.0 * 32768.0)); + s->samples_chanptr[dca_lfe_index[s->amode]]); /* Outputs 20bits pcm samples */ } -- cgit v1.2.3