comparison aacpsy.c @ 12162:f948f8cf97db libavcodec

aacenc: psy_3gpp_init(): Fix line_to_frequency for short windows.
author alexc
date Wed, 14 Jul 2010 04:10:52 +0000
parents d34f0f3ac678
children b25537518e40
comparison
equal deleted inserted replaced
12161:d34f0f3ac678 12162:f948f8cf97db
122 pctx = (Psy3gppContext*) ctx->model_priv_data; 122 pctx = (Psy3gppContext*) ctx->model_priv_data;
123 123
124 minath = ath(3410, ATH_ADD); 124 minath = ath(3410, ATH_ADD);
125 for (j = 0; j < 2; j++) { 125 for (j = 0; j < 2; j++) {
126 Psy3gppCoeffs *coeffs = &pctx->psy_coef[j]; 126 Psy3gppCoeffs *coeffs = &pctx->psy_coef[j];
127 float line_to_frequency = ctx->avctx->sample_rate / 2048.0f; 127 float line_to_frequency = ctx->avctx->sample_rate / (j ? 256.f : 2048.0f);
128 i = 0; 128 i = 0;
129 prev = 0.0; 129 prev = 0.0;
130 for (g = 0; g < ctx->num_bands[j]; g++) { 130 for (g = 0; g < ctx->num_bands[j]; g++) {
131 i += ctx->bands[j][g]; 131 i += ctx->bands[j][g];
132 bark = calc_bark((i-1) * line_to_frequency); 132 bark = calc_bark((i-1) * line_to_frequency);