From d3a6c2ab7e76f12f56932a087266b082dc1dc39b Mon Sep 17 00:00:00 2001 From: Nathan Caldwell Date: Wed, 18 May 2011 23:23:22 -0600 Subject: psymodel: Remove the single channel analysis function --- libavcodec/psymodel.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'libavcodec/psymodel.h') diff --git a/libavcodec/psymodel.h b/libavcodec/psymodel.h index 241f8ecdb3..3e866e40cc 100644 --- a/libavcodec/psymodel.h +++ b/libavcodec/psymodel.h @@ -111,16 +111,6 @@ typedef struct FFPsyModel { */ FFPsyWindowInfo (*window)(FFPsyContext *ctx, const int16_t *audio, const int16_t *la, int channel, int prev_type); - /** - * Perform psychoacoustic analysis and set band info (threshold, energy) for a single channel. - * - * @param ctx model context - * @param channel audio channel number - * @param coeffs pointer to the transformed coefficients - * @param wi window information - */ - void (*analyze)(FFPsyContext *ctx, int channel, const float *coeffs, const FFPsyWindowInfo *wi); - /** * Perform psychoacoustic analysis and set band info (threshold, energy) for a group of channels. * @@ -129,7 +119,7 @@ typedef struct FFPsyModel { * @param coeffs array of pointers to the transformed coefficients * @param wi window information for the channels in the group */ - void (*analyze_group)(FFPsyContext *ctx, int channel, const float **coeffs, const FFPsyWindowInfo *wi); + void (*analyze)(FFPsyContext *ctx, int channel, const float **coeffs, const FFPsyWindowInfo *wi); void (*end) (FFPsyContext *apc); } FFPsyModel; -- cgit v1.2.3