diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-01-04 00:46:36 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-04 00:46:36 +0000 |
commit | 7c908b13b9e8729bd3e230e2a207a55d7b6e1f96 (patch) | |
tree | e0a81869e768cb73ccbf8f22c07f6c8d8008e5ff /libDRCdec/src/drcGainDec_preprocess.cpp | |
parent | 7884aefc84b56d7f805d8e84d378ab468274d3ff (diff) | |
parent | 691d00e6fa72b9cea30782c4cf93c8e3013ed5ed (diff) | |
download | fdk-aac-7c908b13b9e8729bd3e230e2a207a55d7b6e1f96.tar.gz fdk-aac-7c908b13b9e8729bd3e230e2a207a55d7b6e1f96.tar.bz2 fdk-aac-7c908b13b9e8729bd3e230e2a207a55d7b6e1f96.zip |
Merge "Integer overflow fix in _compressorIO_sigmoid()"
Diffstat (limited to 'libDRCdec/src/drcGainDec_preprocess.cpp')
-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); */ |