diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-10-02 22:11:05 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-10-02 22:11:05 +0000 |
| commit | 40b48a82317c9518224f45dfdc8667c6f9eba3be (patch) | |
| tree | 219df1e2e5e2480e2bb6440a8b9e964bed4cba9b /libAACdec/src/conceal.cpp | |
| parent | b97c2a93f288df43dd7cc0c45640509a17dddb18 (diff) | |
| parent | 28234107a71eb9ca3d214bbbe40e57c5055579df (diff) | |
| download | fdk-aac-40b48a82317c9518224f45dfdc8667c6f9eba3be.tar.gz fdk-aac-40b48a82317c9518224f45dfdc8667c6f9eba3be.tar.bz2 fdk-aac-40b48a82317c9518224f45dfdc8667c6f9eba3be.zip | |
Snap for 5044688 from 28234107a71eb9ca3d214bbbe40e57c5055579df to pi-qpr2-release
Change-Id: I3a3fcee6eea771b068b69ab5a1c96ffa00ca397f
Diffstat (limited to 'libAACdec/src/conceal.cpp')
| -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; } |