diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-18 23:13:55 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-18 23:13:55 +0000 |
| commit | f32502581de98dd8cd8c370d55fa7ccadc72c4fc (patch) | |
| tree | fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 | |
| parent | 30be436d0f3954d97dad0b8771834bd001be7ee4 (diff) | |
| parent | c8caff8633e31447de6702b17051adb0cf9e9afe (diff) | |
| download | fdk-aac-f32502581de98dd8cd8c370d55fa7ccadc72c4fc.tar.gz fdk-aac-f32502581de98dd8cd8c370d55fa7ccadc72c4fc.tar.bz2 fdk-aac-f32502581de98dd8cd8c370d55fa7ccadc72c4fc.zip | |
Snap for 5582544 from c8caff8633e31447de6702b17051adb0cf9e9afe to rvc-release
Change-Id: Ie0876a7884b52391ce1dc737a80441be9d99c9cc
| -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); |