aboutsummaryrefslogtreecommitdiffstats
path: root/libDRCdec/src
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2019-04-26 18:52:18 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-26 18:52:18 -0700
commita3a7d15dc2191a450bd288a2008ed6a42e43f142 (patch)
tree3823dc51f22ec509c64e73eff0d211937e0a165e /libDRCdec/src
parent7f075eb874c5391ef1678caf732395b073450542 (diff)
parent14f7e1369382c0a399b991648c96fbcf8940efc8 (diff)
downloadfdk-aac-a3a7d15dc2191a450bd288a2008ed6a42e43f142.tar.gz
fdk-aac-a3a7d15dc2191a450bd288a2008ed6a42e43f142.tar.bz2
fdk-aac-a3a7d15dc2191a450bd288a2008ed6a42e43f142.zip
MPEG-4/D DRC unification, loudness norm default at -24
am: 14f7e13693 Change-Id: I63974f68f2f2a18a6d77e9a5e718a902693679e0
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;