[FFmpeg-cvslog] aacenc_tns: fix coefficient compression condition

[Rostislav Pehlivanov]

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker at gmail.com> | Wed Sep 16 17:48:02 2015 +0100| [5ba811bdf00fc52dec86f5de62c2d8cf3ad0ab47] | committer: Rostislav Pehlivanov

aacenc_tns: fix coefficient compression condition

Signed-off-by: Rostislav Pehlivanov <atomnuker at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ba811bdf00fc52dec86f5de62c2d8cf3ad0ab47
---

 libavcodec/aacenc_tns.c |    2 +-
 tests/fate/aac.mak      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aacenc_tns.c
index 8e0a00f..815b4e3 100644
--- a/libavcodec/aacenc_tns.c
+++ b/libavcodec/aacenc_tns.c
@@ -41,7 +41,7 @@ static inline int compress_coeffs(int *coef, int order, int c_bits)
     const int shift_val = c_bits ?  8 : 4;
     const int high_idx  = c_bits ? 11 : 5;
     for (i = 0; i < order; i++)
-        if (coef[i] < low_idx && coef[i] > high_idx)
+        if (coef[i] < low_idx || coef[i] > high_idx)
             res++;
     if (res == order)
         for (i = 0; i < order; i++)
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak
index 1c815dd..cbefc38 100644
--- a/tests/fate/aac.mak
+++ b/tests/fate/aac.mak
@@ -172,7 +172,7 @@ fate-aac-tns-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-re
 fate-aac-tns-encode: CMP = stddev
 fate-aac-tns-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
 fate-aac-tns-encode: CMP_SHIFT = -4096
-fate-aac-tns-encode: CMP_TARGET = 648.80
+fate-aac-tns-encode: CMP_TARGET = 650.28
 fate-aac-tns-encode: FUZZ = 2.8
 fate-aac-tns-encode: SIZE_TOLERANCE = 3560