diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-09-06 20:17:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-09-06 20:17:07 +0000 |
| commit | b3ea08e059fd9472c792bbd915c0f67aa6ceb1a6 (patch) | |
| tree | bbb66e5e7cbfa6bc3463bd026bda9ea4043d3fd5 | |
| parent | ba003785774efe355bcac950158fc78a0cff0c2b (diff) | |
| parent | f44b50b83529604f1b22e77084f50d575262c4fc (diff) | |
| download | fdk-aac-b3ea08e059fd9472c792bbd915c0f67aa6ceb1a6.tar.gz fdk-aac-b3ea08e059fd9472c792bbd915c0f67aa6ceb1a6.tar.bz2 fdk-aac-b3ea08e059fd9472c792bbd915c0f67aa6ceb1a6.zip | |
Merge "Prevent overflow in concealment clipping check" into pi-dev
| -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; } |