Mercurial > libavcodec.hg

changeset 12161:d34f0f3ac678 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
aacenc: aac_psy_init(): Factorize line_to_frequency.
author alexc
date Wed, 14 Jul 2010 04:10:47 +0000
parents e0bed2f0f9f9
children f948f8cf97db
files aacpsy.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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];
         }