diff options
author | Alex Converse <alex.converse@gmail.com> | 2010-04-30 21:43:29 +0000 |
---|---|---|
committer | Alex Converse <alex.converse@gmail.com> | 2010-04-30 21:43:29 +0000 |
commit | d0dedce71d087c1b1b8012e782b497e99ad6f1d0 (patch) | |
tree | e6628446b763056b974c0b102bac61ab9a0db381 | |
parent | ca6d3f234cd68690100714abff958a9304a095ff (diff) | |
download | ffmpeg-d0dedce71d087c1b1b8012e782b497e99ad6f1d0.tar.gz |
Reindent
Originally committed as revision 22996 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/aac.c | 6 | ||||
-rw-r--r-- | libavcodec/aacsbr.c | 42 |
2 files changed, 24 insertions, 24 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c index eba0c72670..ac8c9c6ec4 100644 --- a/libavcodec/aac.c +++ b/libavcodec/aac.c @@ -1892,9 +1892,9 @@ static void spectral_to_sample(AACContext *ac) apply_channel_coupling(ac, che, type, i, BETWEEN_TNS_AND_IMDCT, apply_dependent_coupling); if (type != TYPE_CCE || che->coup.coupling_point == AFTER_IMDCT) { imdct_and_windowing(ac, &che->ch[0], imdct_bias); - if (type == TYPE_CPE) { - imdct_and_windowing(ac, &che->ch[1], imdct_bias); - } + if (type == TYPE_CPE) { + imdct_and_windowing(ac, &che->ch[1], imdct_bias); + } if (ac->m4ac.sbr > 0) { ff_sbr_apply(ac, &che->sbr, type, che->ch[0].ret, che->ch[1].ret); } diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index b1eb684564..ce85697544 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -1720,28 +1720,28 @@ void ff_sbr_apply(AACContext *ac, SpectralBandReplication *sbr, int id_aac, sbr_dequant(sbr, id_aac); } for (ch = 0; ch < nch; ch++) { - /* decode channel */ - sbr_qmf_analysis(&ac->dsp, &sbr->rdft, ch ? R : L, sbr->data[ch].analysis_filterbank_samples, - (float*)sbr->qmf_filter_scratch, - sbr->data[ch].W, 1/(-1024 * ac->sf_scale)); - sbr_lf_gen(ac, sbr, sbr->X_low, sbr->data[ch].W); - if (sbr->start) { - sbr_hf_inverse_filter(sbr->alpha0, sbr->alpha1, sbr->X_low, sbr->k[0]); - sbr_chirp(sbr, &sbr->data[ch]); - sbr_hf_gen(ac, sbr, sbr->X_high, sbr->X_low, sbr->alpha0, sbr->alpha1, - sbr->data[ch].bw_array, sbr->data[ch].t_env, - sbr->data[ch].bs_num_env); - - // hf_adj - sbr_mapping(ac, sbr, &sbr->data[ch], sbr->data[ch].e_a); - sbr_env_estimate(sbr->e_curr, sbr->X_high, sbr, &sbr->data[ch]); - sbr_gain_calc(ac, sbr, &sbr->data[ch], sbr->data[ch].e_a); - sbr_hf_assemble(sbr->data[ch].Y, sbr->X_high, sbr, &sbr->data[ch], - sbr->data[ch].e_a); - } + /* decode channel */ + sbr_qmf_analysis(&ac->dsp, &sbr->rdft, ch ? R : L, sbr->data[ch].analysis_filterbank_samples, + (float*)sbr->qmf_filter_scratch, + sbr->data[ch].W, 1/(-1024 * ac->sf_scale)); + sbr_lf_gen(ac, sbr, sbr->X_low, sbr->data[ch].W); + if (sbr->start) { + sbr_hf_inverse_filter(sbr->alpha0, sbr->alpha1, sbr->X_low, sbr->k[0]); + sbr_chirp(sbr, &sbr->data[ch]); + sbr_hf_gen(ac, sbr, sbr->X_high, sbr->X_low, sbr->alpha0, sbr->alpha1, + sbr->data[ch].bw_array, sbr->data[ch].t_env, + sbr->data[ch].bs_num_env); + + // hf_adj + sbr_mapping(ac, sbr, &sbr->data[ch], sbr->data[ch].e_a); + sbr_env_estimate(sbr->e_curr, sbr->X_high, sbr, &sbr->data[ch]); + sbr_gain_calc(ac, sbr, &sbr->data[ch], sbr->data[ch].e_a); + sbr_hf_assemble(sbr->data[ch].Y, sbr->X_high, sbr, &sbr->data[ch], + sbr->data[ch].e_a); + } - /* synthesis */ - sbr_x_gen(sbr, sbr->X, sbr->X_low, sbr->data[ch].Y, ch); + /* synthesis */ + sbr_x_gen(sbr, sbr->X, sbr->X_low, sbr->data[ch].Y, ch); } sbr_qmf_synthesis(&ac->dsp, &sbr->mdct, L, sbr->X, sbr->qmf_filter_scratch, sbr->data[0].synthesis_filterbank_samples, |