From 025ccf1f8bd669f45b628acf51e7febcb1fddd3b Mon Sep 17 00:00:00 2001 From: Nathan Caldwell Date: Sat, 17 Dec 2011 18:45:55 -0700 Subject: aacenc: Request normalized float samples instead of converting s16 samples to float. Signed-off-by: Alex Converse --- libavcodec/psymodel.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libavcodec/psymodel.c') diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c index 740d859456..49df1189e4 100644 --- a/libavcodec/psymodel.c +++ b/libavcodec/psymodel.c @@ -112,14 +112,13 @@ av_cold struct FFPsyPreprocessContext* ff_psy_preprocess_init(AVCodecContext *av return ctx; } -void ff_psy_preprocess(struct FFPsyPreprocessContext *ctx, - const int16_t *audio, int16_t *dest, - int tag, int channels) +void ff_psy_preprocess(struct FFPsyPreprocessContext *ctx, const float *audio, + float *dest, int tag, int channels) { int ch, i; if (ctx->fstate) { for (ch = 0; ch < channels; ch++) - ff_iir_filter(ctx->fcoeffs, ctx->fstate[tag+ch], ctx->avctx->frame_size, + ff_iir_filter_flt(ctx->fcoeffs, ctx->fstate[tag+ch], ctx->avctx->frame_size, audio + ch, ctx->avctx->channels, dest + ch, ctx->avctx->channels); } else { -- cgit v1.2.3