Commit 21e8c46c authored by Alex Converse's avatar Alex Converse

Refactor AAC unsigned band type decoding for a modest speedup.

Originally committed as revision 17599 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 039821a8
......@@ -805,14 +805,6 @@ static int decode_spectrum_and_dequant(AACContext * ac, float coef[1024], GetBit
if (vq_ptr[2]) coef[coef_tmp_idx + 2] = sign_lookup[get_bits1(gb)];
if (vq_ptr[3]) coef[coef_tmp_idx + 3] = sign_lookup[get_bits1(gb)];
}
}else {
coef[coef_tmp_idx ] = 1.0f;
coef[coef_tmp_idx + 1] = 1.0f;
if (dim == 4) {
coef[coef_tmp_idx + 2] = 1.0f;
coef[coef_tmp_idx + 3] = 1.0f;
}
}
if (cur_band_type == ESC_BT) {
for (j = 0; j < 2; j++) {
if (vq_ptr[j] == 64.0f) {
......@@ -838,6 +830,14 @@ static int decode_spectrum_and_dequant(AACContext * ac, float coef[1024], GetBit
coef[coef_tmp_idx + 3] *= vq_ptr[3];
}
}
}else {
coef[coef_tmp_idx ] = vq_ptr[0];
coef[coef_tmp_idx + 1] = vq_ptr[1];
if (dim == 4) {
coef[coef_tmp_idx + 2] = vq_ptr[2];
coef[coef_tmp_idx + 3] = vq_ptr[3];
}
}
coef[coef_tmp_idx ] *= sf[idx];
coef[coef_tmp_idx + 1] *= sf[idx];
if (dim == 4) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment