diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2019-01-03 16:57:10 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-03 16:57:10 -0800 |
| commit | 195d913e654401e0b8a20d012b906c3e1f29db59 (patch) | |
| tree | e0a81869e768cb73ccbf8f22c07f6c8d8008e5ff | |
| parent | 81b04be9baf3540329e940b6ce8117463d71279e (diff) | |
| parent | 7c908b13b9e8729bd3e230e2a207a55d7b6e1f96 (diff) | |
| download | fdk-aac-195d913e654401e0b8a20d012b906c3e1f29db59.tar.gz fdk-aac-195d913e654401e0b8a20d012b906c3e1f29db59.tar.bz2 fdk-aac-195d913e654401e0b8a20d012b906c3e1f29db59.zip | |
Merge "Integer overflow fix in _compressorIO_sigmoid()"
am: 7c908b13b9
Change-Id: I8265838085c3db1931a4ccb614ec7e4cdcca63e5
| -rw-r--r-- | libDRCdec/src/drcGainDec_preprocess.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libDRCdec/src/drcGainDec_preprocess.cpp b/libDRCdec/src/drcGainDec_preprocess.cpp index 7919589..c543c53 100644 --- a/libDRCdec/src/drcGainDec_preprocess.cpp +++ b/libDRCdec/src/drcGainDec_preprocess.cpp @@ -300,8 +300,9 @@ static DRC_ERROR _compressorIO_sigmoid(const CUSTOM_DRC_CHAR_SIGMOID* pCChar, FIXP_SGL exp = pCChar->exp; DRC_ERROR err = DE_OK; - tmp = fMultDiv2(DRC_INPUT_LOUDNESS_TARGET - inLevelDb, pCChar->ioRatio); - tmp = SATURATE_LEFT_SHIFT(tmp, 2 + 1, DFRACT_BITS); + tmp = fMultDiv2((DRC_INPUT_LOUDNESS_TARGET >> 1) - (inLevelDb >> 1), + pCChar->ioRatio); + tmp = SATURATE_LEFT_SHIFT(tmp, 2 + 1 + 1, DFRACT_BITS); if (exp < (FIXP_SGL)MAXVAL_SGL) { /* x = tmp / gainDbLimit; */ /* *outGainDb = tmp / pow(1.0f + pow(x, exp), 1.0f/exp); */ |