Commit e8d5c07b authored by Alex Converse's avatar Alex Converse

Re-indent after last commit.

Originally committed as revision 17600 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 21e8c46c
...@@ -805,31 +805,31 @@ static int decode_spectrum_and_dequant(AACContext * ac, float coef[1024], GetBit ...@@ -805,31 +805,31 @@ 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[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 (vq_ptr[3]) coef[coef_tmp_idx + 3] = sign_lookup[get_bits1(gb)];
} }
if (cur_band_type == ESC_BT) { if (cur_band_type == ESC_BT) {
for (j = 0; j < 2; j++) { for (j = 0; j < 2; j++) {
if (vq_ptr[j] == 64.0f) { if (vq_ptr[j] == 64.0f) {
int n = 4; int n = 4;
/* The total length of escape_sequence must be < 22 bits according /* The total length of escape_sequence must be < 22 bits according
to the specification (i.e. max is 11111111110xxxxxxxxxx). */ to the specification (i.e. max is 11111111110xxxxxxxxxx). */
while (get_bits1(gb) && n < 15) n++; while (get_bits1(gb) && n < 15) n++;
if(n == 15) { if(n == 15) {
av_log(ac->avccontext, AV_LOG_ERROR, "error in spectral data, ESC overflow\n"); av_log(ac->avccontext, AV_LOG_ERROR, "error in spectral data, ESC overflow\n");
return -1; return -1;
} }
n = (1<<n) + get_bits(gb, n); n = (1<<n) + get_bits(gb, n);
coef[coef_tmp_idx + j] *= cbrtf(n) * n; coef[coef_tmp_idx + j] *= cbrtf(n) * n;
}else }else
coef[coef_tmp_idx + j] *= vq_ptr[j]; coef[coef_tmp_idx + j] *= vq_ptr[j];
} }
}else }else
{ {
coef[coef_tmp_idx ] *= vq_ptr[0]; coef[coef_tmp_idx ] *= vq_ptr[0];
coef[coef_tmp_idx + 1] *= vq_ptr[1]; coef[coef_tmp_idx + 1] *= vq_ptr[1];
if (dim == 4) { if (dim == 4) {
coef[coef_tmp_idx + 2] *= vq_ptr[2]; coef[coef_tmp_idx + 2] *= vq_ptr[2];
coef[coef_tmp_idx + 3] *= vq_ptr[3]; coef[coef_tmp_idx + 3] *= vq_ptr[3];
}
} }
}
}else { }else {
coef[coef_tmp_idx ] = vq_ptr[0]; coef[coef_tmp_idx ] = vq_ptr[0];
coef[coef_tmp_idx + 1] = vq_ptr[1]; coef[coef_tmp_idx + 1] = vq_ptr[1];
......
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