aboutsummaryrefslogtreecommitdiffstats
path: root/libDRCdec/src
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2019-04-26 19:04:36 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-26 19:04:36 -0700
commit47697ab8f4b11c45dc3bda52e30f9f6946a2c2bd (patch)
tree3823dc51f22ec509c64e73eff0d211937e0a165e /libDRCdec/src
parent3c1da493c8af2c9be589afc40913b7cb0b6014e3 (diff)
parenta3a7d15dc2191a450bd288a2008ed6a42e43f142 (diff)
downloadfdk-aac-47697ab8f4b11c45dc3bda52e30f9f6946a2c2bd.tar.gz
fdk-aac-47697ab8f4b11c45dc3bda52e30f9f6946a2c2bd.tar.bz2
fdk-aac-47697ab8f4b11c45dc3bda52e30f9f6946a2c2bd.zip
MPEG-4/D DRC unification, loudness norm default at -24 am: 14f7e13693
am: a3a7d15dc2 Change-Id: I586f06adc65795be27fc2240615af14efaa69ed4
Diffstat (limited to 'libDRCdec/src')
-rw-r--r--libDRCdec/src/drcDec_selectionProcess.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/libDRCdec/src/drcDec_selectionProcess.cpp b/libDRCdec/src/drcDec_selectionProcess.cpp
index 37f5722..c33bf74 100644
--- a/libDRCdec/src/drcDec_selectionProcess.cpp
+++ b/libDRCdec/src/drcDec_selectionProcess.cpp
@@ -603,14 +603,21 @@ drcDec_SelectionProcess_SetParam(HANDLE_DRC_SELECTION_PROCESS hInstance,
if ((requestValue < (FIXP_DBL)0) ||
(requestValue > FL2FXCONST_DBL(1.0f / (float)(1 << 1))))
return DRCDEC_SELECTION_PROCESS_PARAM_OUT_OF_RANGE;
- diff |= _compAssign(&pSelProcInput->boost, FX_DBL2FX_SGL(requestValue));
+ diff |= _compAssign(
+ &pSelProcInput->boost,
+ FX_DBL2FX_SGL(
+ requestValue +
+ (FIXP_DBL)(1 << 15))); /* convert to FIXP_SGL with rounding */
break;
case SEL_PROC_COMPRESS:
if ((requestValue < (FIXP_DBL)0) ||
(requestValue > FL2FXCONST_DBL(1.0f / (float)(1 << 1))))
return DRCDEC_SELECTION_PROCESS_PARAM_OUT_OF_RANGE;
- diff |=
- _compAssign(&pSelProcInput->compress, FX_DBL2FX_SGL(requestValue));
+ diff |= _compAssign(
+ &pSelProcInput->compress,
+ FX_DBL2FX_SGL(
+ requestValue +
+ (FIXP_DBL)(1 << 15))); /* convert to FIXP_SGL with rounding */
break;
default:
return DRCDEC_SELECTION_PROCESS_INVALID_PARAM;