Merge "Prevent overflow in concealment clipping check" into pi-dev

am: b3ea08e059

Change-Id: I70d38eed9d6d6e52bcf00752c482ce92eddf6497
This commit is contained in:
Fraunhofer IIS FDK 2018-09-06 13:22:37 -07:00 committed by android-build-merger
commit 646ead1a65
1 changed files with 4 additions and 4 deletions

View File

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