diff options
| author | Xin Li <delphij@google.com> | 2019-02-12 09:53:34 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-02-12 09:53:34 -0800 |
| commit | 8e6b62378b1baded1afc5f0c30bd72c81170e456 (patch) | |
| tree | a7dcb32bd00be5b642f57235267938e0dbffb0e3 /libAACdec/src | |
| parent | db4a1deb28561e79086d041f704c8d83b7c8a0ed (diff) | |
| parent | 44e7ae4d1ebb26df0e767b379afdc8e02475422f (diff) | |
| download | fdk-aac-8e6b62378b1baded1afc5f0c30bd72c81170e456.tar.gz fdk-aac-8e6b62378b1baded1afc5f0c30bd72c81170e456.tar.bz2 fdk-aac-8e6b62378b1baded1afc5f0c30bd72c81170e456.zip | |
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug: 124234733
Change-Id: I7ed72a237fd7f0aa984b8077a369a1ddb5ba253b
Diffstat (limited to 'libAACdec/src')
| -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 cc6de75..5895cb8 100644 --- a/libAACdec/src/conceal.cpp +++ b/libAACdec/src/conceal.cpp @@ -2081,11 +2081,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; } |