# HG changeset patch # User alexc # Date 1279080647 0 # Node ID d34f0f3ac678fdcc18d7d2265e94acb8c5b197d0 # Parent e0bed2f0f9f947ee9d86c7f8df65cde22555e8c2 aacenc: aac_psy_init(): Factorize line_to_frequency. diff -r e0bed2f0f9f9 -r d34f0f3ac678 aacpsy.c --- a/aacpsy.c Wed Jul 14 04:10:41 2010 +0000 +++ b/aacpsy.c Wed Jul 14 04:10:47 2010 +0000 @@ -124,11 +124,12 @@ minath = ath(3410, ATH_ADD); for (j = 0; j < 2; j++) { Psy3gppCoeffs *coeffs = &pctx->psy_coef[j]; + float line_to_frequency = ctx->avctx->sample_rate / 2048.0f; i = 0; prev = 0.0; for (g = 0; g < ctx->num_bands[j]; g++) { i += ctx->bands[j][g]; - bark = calc_bark((i-1) * ctx->avctx->sample_rate / 2048.0); + bark = calc_bark((i-1) * line_to_frequency); coeffs->barks[g] = (bark + prev) / 2.0; prev = bark; } @@ -138,9 +139,9 @@ } start = 0; for (g = 0; g < ctx->num_bands[j]; g++) { - minscale = ath(ctx->avctx->sample_rate * start / 1024.0 / 2.0, ATH_ADD); + minscale = ath(start * line_to_frequency, ATH_ADD); for (i = 1; i < ctx->bands[j][g]; i++) - minscale = FFMIN(minscale, ath(ctx->avctx->sample_rate * (start + i) / 1024.0 / 2.0, ATH_ADD)); + minscale = FFMIN(minscale, ath((start + i) * line_to_frequency, ATH_ADD)); coeffs->ath[g] = minscale - minath; start += ctx->bands[j][g]; }