From 323d37521d66233c8d9405dba902100ef146b5ec Mon Sep 17 00:00:00 2001 From: Claudio Freire Date: Sun, 11 Oct 2015 18:06:02 -0300 Subject: AAC encoder: cosmetics from last commit Reindent --- libavcodec/aacpsy.c | 18 +++++++++--------- libavcodec/psymodel.c | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index 34a3ea4296..242df6863a 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -708,16 +708,16 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel, pctx->pe.max = FFMAX(pe, pctx->pe.max); pctx->pe.min = FFMIN(pe, pctx->pe.min); } else { - desired_bits = calc_bit_demand(pctx, pe, ctx->bitres.bits, ctx->bitres.size, wi->num_windows == 8); - desired_pe = PSY_3GPP_BITS_TO_PE(desired_bits); + desired_bits = calc_bit_demand(pctx, pe, ctx->bitres.bits, ctx->bitres.size, wi->num_windows == 8); + desired_pe = PSY_3GPP_BITS_TO_PE(desired_bits); - /* NOTE: PE correction is kept simple. During initial testing it had very - * little effect on the final bitrate. Probably a good idea to come - * back and do more testing later. - */ - if (ctx->bitres.bits > 0) - desired_pe *= av_clipf(pctx->pe.previous / PSY_3GPP_BITS_TO_PE(ctx->bitres.bits), - 0.85f, 1.15f); + /* NOTE: PE correction is kept simple. During initial testing it had very + * little effect on the final bitrate. Probably a good idea to come + * back and do more testing later. + */ + if (ctx->bitres.bits > 0) + desired_pe *= av_clipf(pctx->pe.previous / PSY_3GPP_BITS_TO_PE(ctx->bitres.bits), + 0.85f, 1.15f); } pctx->pe.previous = PSY_3GPP_BITS_TO_PE(desired_bits); ctx->bitres.alloc = desired_bits; diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c index f7bca6890c..76221243cb 100644 --- a/libavcodec/psymodel.c +++ b/libavcodec/psymodel.c @@ -111,18 +111,18 @@ av_cold struct FFPsyPreprocessContext* ff_psy_preprocess_init(AVCodecContext *av /* AAC has its own LP method */ if (avctx->codec_id != AV_CODEC_ID_AAC) { - if (avctx->cutoff > 0) - cutoff_coeff = 2.0 * avctx->cutoff / avctx->sample_rate; - - if (cutoff_coeff && cutoff_coeff < 0.98) - ctx->fcoeffs = ff_iir_filter_init_coeffs(avctx, FF_FILTER_TYPE_BUTTERWORTH, - FF_FILTER_MODE_LOWPASS, FILT_ORDER, - cutoff_coeff, 0.0, 0.0); - if (ctx->fcoeffs) { - ctx->fstate = av_mallocz(sizeof(ctx->fstate[0]) * avctx->channels); - for (i = 0; i < avctx->channels; i++) - ctx->fstate[i] = ff_iir_filter_init_state(FILT_ORDER); - } + if (avctx->cutoff > 0) + cutoff_coeff = 2.0 * avctx->cutoff / avctx->sample_rate; + + if (cutoff_coeff && cutoff_coeff < 0.98) + ctx->fcoeffs = ff_iir_filter_init_coeffs(avctx, FF_FILTER_TYPE_BUTTERWORTH, + FF_FILTER_MODE_LOWPASS, FILT_ORDER, + cutoff_coeff, 0.0, 0.0); + if (ctx->fcoeffs) { + ctx->fstate = av_mallocz(sizeof(ctx->fstate[0]) * avctx->channels); + for (i = 0; i < avctx->channels; i++) + ctx->fstate[i] = ff_iir_filter_init_state(FILT_ORDER); + } } ff_iir_filter_init(&ctx->fiir); -- cgit v1.2.3