summaryrefslogtreecommitdiffstats
path: root/libavcodec/aacpsy.c
diff options
context:
space:
mode:
authorClaudio Freire <klaussfreire@gmail.com>2015-10-11 18:06:02 -0300
committerClaudio Freire <klaussfreire@gmail.com>2015-10-11 18:06:02 -0300
commit323d37521d66233c8d9405dba902100ef146b5ec (patch)
treeccf1aa8873af1bc7bc680b3cd58867e4eb23d4ee /libavcodec/aacpsy.c
parent01ecb7172b684f1c4b3e748f95c5a9a494ca36ec (diff)
downloadffmpeg-streaming-323d37521d66233c8d9405dba902100ef146b5ec.zip
ffmpeg-streaming-323d37521d66233c8d9405dba902100ef146b5ec.tar.gz
AAC encoder: cosmetics from last commit
Reindent
Diffstat (limited to 'libavcodec/aacpsy.c')
-rw-r--r--libavcodec/aacpsy.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c
index 34a3ea4..242df68 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;
OpenPOWER on IntegriCloud