Snap for 5582428 from 5def92cb0fa9284064890d9fe5cb0a54d9e03589 to qt-release
Change-Id: I2e8a3f2c17b6d12097d1cfc242472e76de354dd4
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);