fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Prevent overflow in MPEG-D DRC _setSelectionDataInfo()." am: 652432830a 

am: 692cb872b3

Change-Id: I04560b0c7b756b010cd4b929c74b6343adf53fcf
This commit is contained in:
Fraunhofer IIS FDK 2018-11-27 10:14:02 -08:00 committed by android-build-merger
parent a16b4cba47 692cb872b3
commit d555cedc95
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libDRCdec/src/drcDec_selectionProcess.cpp
View File

@ -1006,15 +1006,23 @@ static DRCDEC_SELECTION_PROCESS_RETURN _preSelectionRequirement7(
return DRCDEC_SELECTION_PROCESS_NO_ERROR; return DRCDEC_SELECTION_PROCESS_NO_ERROR;
} }
static void _setSelectionDataInfo(DRCDEC_SELECTION_DATA* pData, static void _setSelectionDataInfo(
FIXP_DBL loudness, DRCDEC_SELECTION_DATA* pData, FIXP_DBL loudness, /* e = 7 */
FIXP_DBL loudnessNormalizationGainDb, FIXP_DBL loudnessNormalizationGainDb, /* e = 7 */
FIXP_DBL loudnessNormalizationGainDbMax, FIXP_DBL loudnessNormalizationGainDbMax, /* e = 7 */
FIXP_DBL loudnessDeviationMax, FIXP_DBL loudnessDeviationMax, /* e = 7 */
FIXP_DBL signalPeakLevel, FIXP_DBL signalPeakLevel, /* e = 7 */
FIXP_DBL outputPeakLevelMax, FIXP_DBL outputPeakLevelMax, /* e = 7 */
int applyAdjustment) { int applyAdjustment) {
FIXP_DBL adjustment = 0; FIXP_DBL adjustment = 0; /* e = 8 */
/* use e = 8 for all function parameters to prevent overflow */
loudness >>= 1;
loudnessNormalizationGainDb >>= 1;
loudnessNormalizationGainDbMax >>= 1;
loudnessDeviationMax >>= 1;
signalPeakLevel >>= 1;
outputPeakLevelMax >>= 1;
if (applyAdjustment) { if (applyAdjustment) {
adjustment = adjustment =
@ -1028,6 +1036,14 @@ static void _setSelectionDataInfo(DRCDEC_SELECTION_DATA* pData,
pData->outputLoudness = loudness + pData->loudnessNormalizationGainDbAdjusted; pData->outputLoudness = loudness + pData->loudnessNormalizationGainDbAdjusted;
pData->outputPeakLevel = pData->outputPeakLevel =
signalPeakLevel + pData->loudnessNormalizationGainDbAdjusted; signalPeakLevel + pData->loudnessNormalizationGainDbAdjusted;
/* shift back to e = 7 using saturation */
pData->loudnessNormalizationGainDbAdjusted = SATURATE_LEFT_SHIFT(
pData->loudnessNormalizationGainDbAdjusted, 1, DFRACT_BITS);
pData->outputLoudness =
SATURATE_LEFT_SHIFT(pData->outputLoudness, 1, DFRACT_BITS);
pData->outputPeakLevel =
SATURATE_LEFT_SHIFT(pData->outputPeakLevel, 1, DFRACT_BITS);
} }
static int _targetLoudnessInRange( static int _targetLoudnessInRange(