aboutsummaryrefslogtreecommitdiffstats
path: root/libPCMutils/src/limiter.cpp
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2022-01-10 13:44:04 +0200
committerMartin Storsjo <martin@martin.st>2022-01-10 13:55:34 +0200
commit41ae84525e66febd33ea1fa0130a5b46610f4173 (patch)
tree2e7f66da35feda4d6136c3a9e970ebee254d0c2d /libPCMutils/src/limiter.cpp
parent573e93e4d0d08127dd3b2297a0ce52221527d90a (diff)
parentdd6d9f9f6c9d095bd159d4f0d8b36a6b7e6057a8 (diff)
downloadfdk-aac-41ae84525e66febd33ea1fa0130a5b46610f4173.tar.gz
fdk-aac-41ae84525e66febd33ea1fa0130a5b46610f4173.tar.bz2
fdk-aac-41ae84525e66febd33ea1fa0130a5b46610f4173.zip
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libPCMutils/src/limiter.cpp')
-rw-r--r--libPCMutils/src/limiter.cpp5
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
}
}