diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-10-04 23:59:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-04 23:59:49 +0000 |
| commit | 78f80da872c305122f0a439402cc069d8b3b0a5c (patch) | |
| tree | d5588ac1ccd587c9fb7288aaaea86093c4a626b4 | |
| parent | 8704782ffded248043bd37caaafd9c392e2add6b (diff) | |
| parent | b4e310993737d4d158b0c4f9194c255a163fc70b (diff) | |
| download | aac-master-cuttlefish-testing-release.tar.gz | |
Merge "Signed Integer Overflow in DuckerCalcEnergy()"master-cuttlefish-testing-release
| -rw-r--r-- | libFDK/src/FDK_decorrelate.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libFDK/src/FDK_decorrelate.cpp b/libFDK/src/FDK_decorrelate.cpp index 8e665b7..c5de79a 100644 --- a/libFDK/src/FDK_decorrelate.cpp +++ b/libFDK/src/FDK_decorrelate.cpp @@ -1086,8 +1086,9 @@ static INT DuckerCalcEnergy(DUCKER_INSTANCE *const self, pb = SpatialDecGetProcessingBand(maxHybBand, self->mapHybBands2ProcBands); for (qs = startHybBand; qs <= maxHybBand; qs++) { pb = SpatialDecGetProcessingBand(qs, self->mapHybBands2ProcBands); - energy[pb] += - (fPow2Div2(inputReal[qs] << clz) + fPow2Div2(inputImag[qs] << clz)); + energy[pb] = + fAddSaturate(energy[pb], fPow2Div2(inputReal[qs] << clz) + + fPow2Div2(inputImag[qs] << clz)); } pb++; @@ -1100,7 +1101,7 @@ static INT DuckerCalcEnergy(DUCKER_INSTANCE *const self, FIXP_DBL nrg = 0; qs_next = (int)self->qs_next[pb]; for (; qs < qs_next; qs++) { - nrg += fPow2Div2(inputReal[qs] << clz); + nrg = fAddSaturate(nrg, fPow2Div2(inputReal[qs] << clz)); } energy[pb] = nrg; } @@ -1138,13 +1139,14 @@ static INT DuckerCalcEnergy(DUCKER_INSTANCE *const self, #else for (qs = startHybBand; qs <= maxHybBand; qs++) { int pb = SpatialDecGetProcessingBand(qs, self->mapHybBands2ProcBands); - energy[pb] += - (fPow2Div2(inputReal[qs] << clz) + fPow2Div2(inputImag[qs] << clz)); + energy[pb] = + fAddSaturate(energy[pb], fPow2Div2(inputReal[qs] << clz) + + fPow2Div2(inputImag[qs] << clz)); } for (; qs <= maxHybridBand; qs++) { int pb = SpatialDecGetProcessingBand(qs, self->mapHybBands2ProcBands); - energy[pb] += fPow2Div2(inputReal[qs] << clz); + energy[pb] = fAddSaturate(energy[pb], fPow2Div2(inputReal[qs] << clz)); } #endif /* FUNCTION_DuckerCalcEnergy_func4 */ } @@ -1237,9 +1239,9 @@ static INT DuckerApply(DUCKER_INSTANCE *const self, tmp1 = scaleValue(tmp1, scaleSmoothDirRevNrg_asExponent); tmp2 = scaleValue(tmp2, scaleSmoothDirRevNrg_asExponent); - tmp1 = fMultAddDiv2(tmp1, directNrg[pb] >> scaleDirectNrg, + tmp1 = fMultAddDiv2(tmp1, scaleValue(directNrg[pb], -scaleDirectNrg), DUCK_ONE_MINUS_ALPHA_X4_FDK); - tmp2 = fMultAddDiv2(tmp2, reverbNrg[pb] >> scaleReverbNrg, + tmp2 = fMultAddDiv2(tmp2, scaleValue(reverbNrg[pb], -scaleReverbNrg), DUCK_ONE_MINUS_ALPHA_X4_FDK); } else { tmp1 = fMultAddDiv2(tmp1, directNrg[pb], DUCK_ONE_MINUS_ALPHA_X4_FDK); |