commit 232d00017306ad6a8a3fe43487cf61c3e24e0e9b
author Jean-Michel Trivi <jmtrivi@google.com> Wed Dec 26 17:06:09 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 26 17:06:09 2018 -0800
tree ac749121dfc55b0a1a55b0180ca8de59379d568a
parent a8e50fd20e0a8242a38af41d98d694b32729960d
parent 86d12efb927c91a4b8f6f995a023fb05958ae3e9

Merge "Fix SATURATE_LEFT_SHIFT_ALT() since it returned 0x80000000 in certain cases" am: 27894057af
am: 86d12efb92

Change-Id: I61e1f526eccf8c6cdf428058ba7b1da4ae2f9a80

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