commit d5724aefe91189c173833d792f1ab1b5e17d8eec
author Xin Li <delphij@google.com> Wed Feb 20 16:25:58 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 20 16:25:58 2019 +0000
tree a7dcb32bd00be5b642f57235267938e0dbffb0e3
parent b30e02cfd33956c57dea76417be4be0862e642dd
parent 7ac13ae4aaac5c67143f5f797f8506563747b998

Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"

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;
       }