diff options
author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-12-08 13:24:48 +0000 |
---|---|---|
committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-12-08 13:31:55 +0000 |
commit | 4c5136a48ba8beb7737a0b67d4d4f64add1263a9 (patch) | |
tree | 2c75ba8c905a4360248d3c96c7df0e9c6ee03084 | |
parent | 6e5dbe7267fc5790ff48225623be2ed9abd575c9 (diff) | |
download | ffmpeg-4c5136a48ba8beb7737a0b67d4d4f64add1263a9.tar.gz |
aacenc_ltp: disable LTP with high lambda values
Makes no sense to enable for high bitrates, the coder does well enough.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
-rw-r--r-- | libavcodec/aacenc_ltp.c | 2 | ||||
-rw-r--r-- | tests/fate/aac.mak | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacenc_ltp.c b/libavcodec/aacenc_ltp.c index 1917ee979e..b9d43b470a 100644 --- a/libavcodec/aacenc_ltp.c +++ b/libavcodec/aacenc_ltp.c @@ -173,7 +173,7 @@ void ff_aac_search_for_ltp(AACEncContext *s, SingleChannelElement *sce, return; } - if (!sce->ics.ltp.lag) + if (!sce->ics.ltp.lag || s->lambda > 120.0f) return; for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) { diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 816fbf066f..4e55b76dfc 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -209,7 +209,7 @@ fate-aac-ltp-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-re fate-aac-ltp-encode: CMP = stddev fate-aac-ltp-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav fate-aac-ltp-encode: CMP_SHIFT = -4096 -fate-aac-ltp-encode: CMP_TARGET = 1273 +fate-aac-ltp-encode: CMP_TARGET = 1270 fate-aac-ltp-encode: SIZE_TOLERANCE = 3560 fate-aac-ltp-encode: FUZZ = 17 |