diff options
| author | Xin Li <delphij@google.com> | 2019-02-20 16:25:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-20 16:25:58 +0000 |
| commit | d5724aefe91189c173833d792f1ab1b5e17d8eec (patch) | |
| tree | a7dcb32bd00be5b642f57235267938e0dbffb0e3 | |
| parent | b30e02cfd33956c57dea76417be4be0862e642dd (diff) | |
| parent | 7ac13ae4aaac5c67143f5f797f8506563747b998 (diff) | |
| download | fdk-aac-d5724aefe91189c173833d792f1ab1b5e17d8eec.tar.gz fdk-aac-d5724aefe91189c173833d792f1ab1b5e17d8eec.tar.bz2 fdk-aac-d5724aefe91189c173833d792f1ab1b5e17d8eec.zip | |
Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
| -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; } |