diff options
| author | Xin Li <delphij@google.com> | 2021-10-06 22:52:53 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-10-06 22:52:53 +0000 |
| commit | 1b5221d9fee482e03342eb1593f580754fa7ab3f (patch) | |
| tree | c6a1ddee22e29d9ea00ec2523071a711368189cd /libPCMutils/src/limiter.cpp | |
| parent | 6d10f91a77002b6371ebada491f507ef974ca572 (diff) | |
| parent | a950cd990528f07b93cc5af48145e7cb6bfeb3ca (diff) | |
| download | fdk-aac-1b5221d9fee482e03342eb1593f580754fa7ab3f.tar.gz fdk-aac-1b5221d9fee482e03342eb1593f580754fa7ab3f.tar.bz2 fdk-aac-1b5221d9fee482e03342eb1593f580754fa7ab3f.zip | |
Merge Android 12
Bug: 202323961
Merged-In: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947
Change-Id: Iebff00b0ddec06e5d43a6f0109325613701dc05d
Diffstat (limited to 'libPCMutils/src/limiter.cpp')
| -rw-r--r-- | libPCMutils/src/limiter.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libPCMutils/src/limiter.cpp b/libPCMutils/src/limiter.cpp index 598dc0c..c6b8687 100644 --- a/libPCMutils/src/limiter.cpp +++ b/libPCMutils/src/limiter.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -322,7 +322,8 @@ TDLIMITER_ERROR pcmLimiter_Apply(TDLimiterPtr limiter, PCM_LIM* samplesIn, (FIXP_DBL)SATURATE_LEFT_SHIFT(tmp, scaling, DFRACT_BITS)); #else samplesOut[j] = (INT_PCM)FX_DBL2FX_PCM((FIXP_DBL)SATURATE_LEFT_SHIFT( - tmp + ((FIXP_DBL)0x8000 >> scaling), scaling, DFRACT_BITS)); + (tmp >> 1) + ((FIXP_DBL)0x8000 >> (scaling + 1)), scaling + 1, + DFRACT_BITS)); #endif } } |