diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2019-05-17 12:44:48 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-17 12:44:48 -0700 |
| commit | c48b4650d178ee16d8c119202ebc50a3294fdcac (patch) | |
| tree | fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 | |
| parent | 9987c7ba884f1ff3ee865fbb1f6eabf337edbfab (diff) | |
| parent | a79871af3ca959b96eb1f7976ee491f4e6848ed5 (diff) | |
| download | fdk-aac-c48b4650d178ee16d8c119202ebc50a3294fdcac.tar.gz fdk-aac-c48b4650d178ee16d8c119202ebc50a3294fdcac.tar.bz2 fdk-aac-c48b4650d178ee16d8c119202ebc50a3294fdcac.zip | |
Integer overflow fix in FDKaacEnc_initAvoidHoleFlag() am: 5def92cb0f
am: a79871af3c
Change-Id: I37b2577508e6f7f7d48f6b056c27f5eabe1fd9b5
| -rw-r--r-- | libAACenc/src/adj_thr.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
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 @@ static void FDKaacEnc_initAvoidHoleFlag( 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); |