commit c08ee65450a2bf52ffc09d6317c25626b3b81173
author Xin Li <delphij@google.com> Thu Dec 13 12:13:40 2018 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 13 12:13:40 2018 -0800
tree 37a1b26326e4949a075314bf37e9d604552fba04
parent 2373e71ff8e3f113d7879f282572ae3722b7ac04
parent 1fdfa469a6fabc2118f5ad1b5025fd51f92ad303

[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 20c336953f  -s ours
am: 1fdfa469a6  -s ours

Change-Id: I4224085df6dd07c11fcc0caa42ae1e2e40d8a05e

libAACdec/src/conceal.cpp

diff --git a/libAACdec/src/conceal.cpp b/libAACdec/src/conceal.cpp
index a6064b6..569d672 100644
--- a/libAACdec/src/conceal.cpp
+++ b/libAACdec/src/conceal.cpp
@@ -2080,11 +2080,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;
       }