# HG changeset patch # User alexc # Date 1235613094 0 # Node ID 54973ad4b7cf50b59b16f43bc04814a3643202f2 # Parent 0cffed11ee331740143c5a77a294890812b7ab24 Refactor AAC unsigned band type decoding for a modest speedup. diff -r 0cffed11ee33 -r 54973ad4b7cf aac.c --- a/aac.c Thu Feb 26 01:50:00 2009 +0000 +++ b/aac.c Thu Feb 26 01:51:34 2009 +0000 @@ -805,14 +805,6 @@ 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 @@ 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) {