commit e8d354305f6a486d1abd142d292fd23b95fe1f5c
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> Wed Jan 02 12:49:57 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 02 12:49:57 2019 -0800
tree 0be53dcb304dddde84c65a7396173d88f6cf986f
parent dedce44ca873ceb1e4269c7427177da7a3110b8c
parent 8bdeed59aa956c50f5a70cfa7ea8a66b16278fe2

Merge changes I7add6dff,I0249f758 am: b42dfa745b
am: 8bdeed59aa

Change-Id: I335f3e5f617add8bdbfc6e5c0bb6a0eab80f4f9a

libAACdec/src/conceal.cpp

diff --git a/libAACdec/src/conceal.cpp b/libAACdec/src/conceal.cpp
index cc6de75..5895cb8 100644
--- a/libAACdec/src/conceal.cpp
+++ b/libAACdec/src/conceal.cpp
@@ -2081,11 +2081,11 @@
       noiseVal = FX_DBL2FX_PCM(fMult(noiseValLong, TDNoiseAtt));
 
       /* add filtered noise - check for clipping, before */
-      if (pcmdata[ii] > (FIXP_PCM)MAXVAL_FIXP_PCM - noiseVal &&
-          noiseVal > (FIXP_PCM)0) {
+      if (noiseVal > (FIXP_PCM)0 &&
+          pcmdata[ii] > (FIXP_PCM)MAXVAL_FIXP_PCM - noiseVal) {
         noiseVal = noiseVal * (FIXP_PCM)-1;
-      } else if (pcmdata[ii] < (FIXP_PCM)MINVAL_FIXP_PCM - noiseVal &&
-                 noiseVal < (FIXP_PCM)0) {
+      } else if (noiseVal < (FIXP_PCM)0 &&
+                 pcmdata[ii] < (FIXP_PCM)MINVAL_FIXP_PCM - noiseVal) {
         noiseVal = noiseVal * (FIXP_PCM)-1;
       }