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/aacenc.c | 2 +- libavcodec/aacpsy.c | 9 ++++----- libavcodec/psymodel.h | 12 +----------- 3 files changed, 6 insertions(+), 17 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 385c6aa994..dd8a83c537 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -572,7 +572,7 @@ static int aac_encode_frame(AVCodecContext *avctx, put_bits(&s->pb, 4, chan_el_counter[tag]++); for (ch = 0; ch < chans; ch++) coeffs[ch] = cpe->ch[ch].coeffs; - s->psy.model->analyze_group(&s->psy, start_ch, coeffs, wi); + s->psy.model->analyze(&s->psy, start_ch, coeffs, wi); for (ch = 0; ch < chans; ch++) { s->cur_channel = start_ch * 2 + ch; s->coder->search_for_quantizers(avctx, s, &cpe->ch[ch], s->lambda); diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index ff17846e9d..93ff934b2a 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -557,8 +557,8 @@ static float calc_reduced_thr_3gpp(AacPsyBand *band, float min_snr, /** * Calculate band thresholds as suggested in 3GPP TS26.403 */ -static void psy_3gpp_analyze(FFPsyContext *ctx, int channel, - const float *coefs, const FFPsyWindowInfo *wi) +static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel, + const float *coefs, const FFPsyWindowInfo *wi) { AacPsyContext *pctx = (AacPsyContext*) ctx->model_priv_data; AacPsyChannel *pch = &pctx->ch[channel]; @@ -741,14 +741,14 @@ static void psy_3gpp_analyze(FFPsyContext *ctx, int channel, memcpy(pch->prev_band, pch->band, sizeof(pch->band)); } -static void psy_3gpp_analyze_group(FFPsyContext *ctx, int channel, +static void psy_3gpp_analyze(FFPsyContext *ctx, int channel, const float **coeffs, const FFPsyWindowInfo *wi) { int ch; FFPsyChannelGroup *group = ff_psy_find_group(ctx, channel); for (ch = 0; ch < group->num_ch; ch++) - psy_3gpp_analyze(ctx, channel + ch, coeffs[ch], &wi[ch]); + psy_3gpp_analyze_channel(ctx, channel + ch, coeffs[ch], &wi[ch]); } static av_cold void psy_3gpp_end(FFPsyContext *apc) @@ -931,6 +931,5 @@ const FFPsyModel ff_aac_psy_model = .init = psy_3gpp_init, .window = psy_lame_window, .analyze = psy_3gpp_analyze, - .analyze_group = psy_3gpp_analyze_group, .end = psy_3gpp_end, }; 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