commit 61b5f49362a1714c04160da41d57f9b0560a8ff0
author Jean-Michel Trivi <jmtrivi@google.com> Fri Dec 28 15:19:34 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 28 15:19:34 2018 -0800
tree de5e430b6750fb1e0f7215059973a8b772772b46
parent 7b664f0bea348bcc86329e58b8a4f05f767608e1
parent ffb999bec41745ddd3638073d4facfc8c93d36f4

Merge "Add valid bits check to adts header parser" am: b622299482
am: ffb999bec4

Change-Id: I9769e9e7152cc5294f3b1a925487938803f40878

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