Mercurial > libavcodec.hg
changeset 9053:c6bd71120376 libavcodec
Re-indent after last commit.
| author | alexc |
|---|---|
| date | Thu, 26 Feb 2009 01:54:16 +0000 |
| parents | 54973ad4b7cf |
| children | 7eedb5796dd8 |
| files | aac.c |
| diffstat | 1 files changed, 24 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/aac.c Thu Feb 26 01:51:34 2009 +0000 +++ b/aac.c Thu Feb 26 01:54:16 2009 +0000 @@ -805,31 +805,31 @@ 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)]; } - if (cur_band_type == ESC_BT) { - for (j = 0; j < 2; j++) { - if (vq_ptr[j] == 64.0f) { - int n = 4; - /* The total length of escape_sequence must be < 22 bits according - to the specification (i.e. max is 11111111110xxxxxxxxxx). */ - while (get_bits1(gb) && n < 15) n++; - if(n == 15) { - av_log(ac->avccontext, AV_LOG_ERROR, "error in spectral data, ESC overflow\n"); - return -1; - } - n = (1<<n) + get_bits(gb, n); - coef[coef_tmp_idx + j] *= cbrtf(n) * n; - }else - coef[coef_tmp_idx + j] *= vq_ptr[j]; + if (cur_band_type == ESC_BT) { + for (j = 0; j < 2; j++) { + if (vq_ptr[j] == 64.0f) { + int n = 4; + /* The total length of escape_sequence must be < 22 bits according + to the specification (i.e. max is 11111111110xxxxxxxxxx). */ + while (get_bits1(gb) && n < 15) n++; + if(n == 15) { + av_log(ac->avccontext, AV_LOG_ERROR, "error in spectral data, ESC overflow\n"); + return -1; + } + n = (1<<n) + get_bits(gb, n); + coef[coef_tmp_idx + j] *= cbrtf(n) * n; + }else + coef[coef_tmp_idx + j] *= vq_ptr[j]; + } + }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]; + } } - }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]; - } - } }else { coef[coef_tmp_idx ] = vq_ptr[0]; coef[coef_tmp_idx + 1] = vq_ptr[1];