commit a79871af3ca959b96eb1f7976ee491f4e6848ed5
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> Fri May 17 11:47:16 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 17 11:47:16 2019 -0700
tree fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98
parent d4a622c288b12d7799f644e3b52237531c748786
parent 5def92cb0fa9284064890d9fe5cb0a54d9e03589

Integer overflow fix in FDKaacEnc_initAvoidHoleFlag()
am: 5def92cb0f

Change-Id: Ib2bb23763ffadc6a34669d0db79d203991cdf141

libAACenc/src/adj_thr.cpp

diff --git a/libAACenc/src/adj_thr.cpp b/libAACenc/src/adj_thr.cpp
index 6e19680..226d003 100644
--- a/libAACenc/src/adj_thr.cpp
+++ b/libAACenc/src/adj_thr.cpp
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------------
 Software License for The Fraunhofer FDK AAC Codec Library for Android
 
-© Copyright  1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten
+© Copyright  1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
 Forschung e.V. All rights reserved.
 
  1.    INTRODUCTION
@@ -591,13 +591,11 @@
           if (sfbEn > avgEn) {
             FIXP_DBL tmpMinSnrLdData;
             if (psyOutChannel[ch]->lastWindowSequence == LONG_WINDOW)
-              tmpMinSnrLdData =
-                  fixMax(SnrLdFac + (FIXP_DBL)(avgEnLdData - sfbEnLdData),
-                         (FIXP_DBL)SnrLdMin1);
+              tmpMinSnrLdData = SnrLdFac + fixMax(avgEnLdData - sfbEnLdData,
+                                                  SnrLdMin1 - SnrLdFac);
             else
-              tmpMinSnrLdData =
-                  fixMax(SnrLdFac + (FIXP_DBL)(avgEnLdData - sfbEnLdData),
-                         (FIXP_DBL)SnrLdMin3);
+              tmpMinSnrLdData = SnrLdFac + fixMax(avgEnLdData - sfbEnLdData,
+                                                  SnrLdMin3 - SnrLdFac);
 
             qcOutChan->sfbMinSnrLdData[sfbGrp + sfb] = fixMin(
                 qcOutChan->sfbMinSnrLdData[sfbGrp + sfb], tmpMinSnrLdData);