diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-02-09 02:17:39 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-02-09 02:17:39 +0000 |
| commit | 44e7ae4d1ebb26df0e767b379afdc8e02475422f (patch) | |
| tree | 960883277ed86760eec6f3d9a3afca9c21fd914e | |
| parent | 33acbd97b67a3c740f7b54fae2ce127803b70c20 (diff) | |
| parent | 75987acc798db1fe03002d04500dac994eb6d20c (diff) | |
| download | fdk-aac-44e7ae4d1ebb26df0e767b379afdc8e02475422f.tar.gz fdk-aac-44e7ae4d1ebb26df0e767b379afdc8e02475422f.tar.bz2 fdk-aac-44e7ae4d1ebb26df0e767b379afdc8e02475422f.zip | |
Snap for 5180536 from 75987acc798db1fe03002d04500dac994eb6d20c to pi-platform-release
Change-Id: I5ebe5584689c6ac68fa82bef53068d114d4fc91f
| -rw-r--r-- | libAACdec/src/conceal.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libAACdec/src/conceal.cpp b/libAACdec/src/conceal.cpp index a6064b6..569d672 100644 --- a/libAACdec/src/conceal.cpp +++ b/libAACdec/src/conceal.cpp @@ -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; } |