diff options
| author | Xin Li <delphij@google.com> | 2019-09-05 16:53:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-05 16:53:26 +0000 |
| commit | d929f68a05f5cbdd812dca287c8115a39439acf1 (patch) | |
| tree | fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 /libAACenc/src/adj_thr.cpp | |
| parent | c2eb64586d6dfc0f067ea66631b38d1922a106ed (diff) | |
| parent | a209adb315f970aa97044a82551a6f5617d61ded (diff) | |
| download | fdk-aac-d929f68a05f5cbdd812dca287c8115a39439acf1.tar.gz fdk-aac-d929f68a05f5cbdd812dca287c8115a39439acf1.tar.bz2 fdk-aac-d929f68a05f5cbdd812dca287c8115a39439acf1.zip | |
Merge "DO NOT MERGE - Merge Android 10 into master"
Diffstat (limited to 'libAACenc/src/adj_thr.cpp')
| -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); |