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.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libavcodec/psymodel.h') diff --git a/libavcodec/psymodel.h b/libavcodec/psymodel.h index 3e866e40cc..03d078ed58 100644 --- a/libavcodec/psymodel.h +++ b/libavcodec/psymodel.h @@ -109,7 +109,7 @@ typedef struct FFPsyModel { * * @return suggested window information in a structure */ - FFPsyWindowInfo (*window)(FFPsyContext *ctx, const int16_t *audio, const int16_t *la, int channel, int prev_type); + FFPsyWindowInfo (*window)(FFPsyContext *ctx, const float *audio, const float *la, int channel, int prev_type); /** * Perform psychoacoustic analysis and set band info (threshold, energy) for a group of channels. @@ -179,9 +179,8 @@ av_cold struct FFPsyPreprocessContext* ff_psy_preprocess_init(AVCodecContext *av * @param tag channel number * @param channels number of channel to preprocess (some additional work may be done on stereo pair) */ -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); /** * Cleanup audio preprocessing module. -- cgit v1.2.3