diff options
| author | Nathan Caldwell <saintdev@gmail.com> | 2011-05-18 23:23:22 -0600 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2011-06-29 14:28:53 -0700 |
| commit | d3a6c2ab7e76f12f56932a087266b082dc1dc39b (patch) | |
| tree | ed2a8354c89847e7e2a78b6e5da7956ecf2f1586 /libavcodec/aacpsy.c | |
| parent | 01344fe409da286cd377f9af610eb4c4888687ec (diff) | |
psymodel: Remove the single channel analysis function
Diffstat (limited to 'libavcodec/aacpsy.c')
| -rw-r--r-- | libavcodec/aacpsy.c | 9 |
1 files changed, 4 insertions, 5 deletions
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, }; |