diff options
Diffstat (limited to 'ffmpeg/libavcodec/ac3enc_template.c')
| -rw-r--r-- | ffmpeg/libavcodec/ac3enc_template.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ffmpeg/libavcodec/ac3enc_template.c b/ffmpeg/libavcodec/ac3enc_template.c index 0389c2e..4689f70 100644 --- a/ffmpeg/libavcodec/ac3enc_template.c +++ b/ffmpeg/libavcodec/ac3enc_template.c @@ -34,10 +34,6 @@ static void scale_coefficients(AC3EncodeContext *s); -static void apply_window(void *dsp, SampleType *output, - const SampleType *input, const SampleType *window, - unsigned int len); - static int normalize_samples(AC3EncodeContext *s); static void clip_coefficients(DSPContext *dsp, CoefType *coef, unsigned int len); @@ -105,11 +101,11 @@ static void apply_mdct(AC3EncodeContext *s) const SampleType *input_samples = &s->planar_samples[ch][blk * AC3_BLOCK_SIZE]; #if CONFIG_AC3ENC_FLOAT - apply_window(&s->fdsp, s->windowed_samples, input_samples, - s->mdct_window, AC3_WINDOW_SIZE); + s->fdsp.vector_fmul(s->windowed_samples, input_samples, + s->mdct_window, AC3_WINDOW_SIZE); #else - apply_window(&s->dsp, s->windowed_samples, input_samples, - s->mdct_window, AC3_WINDOW_SIZE); + s->ac3dsp.apply_window_int16(s->windowed_samples, input_samples, + s->mdct_window, AC3_WINDOW_SIZE); #endif if (s->fixed_point) @@ -361,7 +357,7 @@ static void compute_rematrixing_strategy(AC3EncodeContext *s) } for (bnd = 0; bnd < block->num_rematrixing_bands; bnd++) { - /* calculate calculate sum of squared coeffs for one band in one block */ + /* calculate sum of squared coeffs for one band in one block */ int start = ff_ac3_rematrix_band_tab[bnd]; int end = FFMIN(nb_coefs, ff_ac3_rematrix_band_tab[bnd+1]); CoefSumType sum[4]; |