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 concealment clipping check" into pi-dev am: b3ea08e059 

am: 646ead1a65

Change-Id: I76943ca6e6c4541924c34ce6e7da5bf95676abec
This commit is contained in:
Fraunhofer IIS FDK 2018-09-06 13:34:42 -07:00 committed by android-build-merger
parent b5a223ae08 646ead1a65
commit 983a134adb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libAACdec/src/conceal.cpp
View File

@ -2080,11 +2080,11 @@ static void CConcealment_TDNoise_Apply(CConcealmentInfo *const pConcealmentInfo,
noiseVal = FX_DBL2FX_PCM(fMult(noiseValLong, TDNoiseAtt)); noiseVal = FX_DBL2FX_PCM(fMult(noiseValLong, TDNoiseAtt));
/* add filtered noise - check for clipping, before */ /* add filtered noise - check for clipping, before */
if (pcmdata[ii] > (FIXP_PCM)MAXVAL_FIXP_PCM - noiseVal && if (noiseVal > (FIXP_PCM)0 &&
noiseVal > (FIXP_PCM)0) { pcmdata[ii] > (FIXP_PCM)MAXVAL_FIXP_PCM - noiseVal) {
noiseVal = noiseVal * (FIXP_PCM)-1; noiseVal = noiseVal * (FIXP_PCM)-1;
} else if (pcmdata[ii] < (FIXP_PCM)MINVAL_FIXP_PCM - noiseVal && } else if (noiseVal < (FIXP_PCM)0 &&
noiseVal < (FIXP_PCM)0) { pcmdata[ii] < (FIXP_PCM)MINVAL_FIXP_PCM - noiseVal) {
noiseVal = noiseVal * (FIXP_PCM)-1; noiseVal = noiseVal * (FIXP_PCM)-1;
} }