diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-31 04:20:18 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-31 04:20:18 +0000 |
| commit | d2ffcd68adb7f00254255e81dec205ffa67a8758 (patch) | |
| tree | 45c8b795b34a9ce7fb67908b735acd88bb80f823 /libPCMutils/src | |
| parent | cdc84f84e9fb9399ce410ce3c05332ffd442aad0 (diff) | |
| parent | 47b23c88cfe81bbcc9ff0c8de1608283de18a475 (diff) | |
| download | fdk-aac-d2ffcd68adb7f00254255e81dec205ffa67a8758.tar.gz fdk-aac-d2ffcd68adb7f00254255e81dec205ffa67a8758.tar.bz2 fdk-aac-d2ffcd68adb7f00254255e81dec205ffa67a8758.zip | |
Snap for 6104206 from 47b23c88cfe81bbcc9ff0c8de1608283de18a475 to rvc-release
Change-Id: I37ae8a78b271948e025a2e6c071453480dcc9a52
Diffstat (limited to 'libPCMutils/src')
| -rw-r--r-- | libPCMutils/src/limiter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libPCMutils/src/limiter.cpp b/libPCMutils/src/limiter.cpp index a799a51..60e3e3b 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 - 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 @@ -239,8 +239,8 @@ TDLIMITER_ERROR pcmLimiter_Apply(TDLimiterPtr limiter, PCM_LIM* samplesIn, tmp1 = (FIXP_DBL)0; for (j = 0; j < channels; j++) { tmp2 = PCM_LIM2FIXP_DBL(samplesIn[j]); - tmp2 = fAbs(tmp2); - tmp2 = FIXP_DBL(INT(tmp2) ^ INT((tmp2 >> (SAMPLE_BITS_LIM - 1)))); + tmp2 = + (tmp2 == (FIXP_DBL)MINVAL_DBL) ? (FIXP_DBL)MAXVAL_DBL : fAbs(tmp2); tmp1 = fMax(tmp1, tmp2); } tmp = fMult(tmp1, additionalGain); |