fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Signed Integer Overflow in DuckerCalcEnergy()" 

am: 78f80da872

Change-Id: If4010115866eeb52033fa361aafdb6665c824471
This commit is contained in:
Jean-Michel Trivi 2018-10-04 17:15:49 -07:00 committed by android-build-merger
parent fa1ce53961 78f80da872
commit efe7d49245
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libFDK/src/FDK_decorrelate.cpp
View File

@ -1086,8 +1086,9 @@ static INT DuckerCalcEnergy(DUCKER_INSTANCE *const self,
pb = SpatialDecGetProcessingBand(maxHybBand, self->mapHybBands2ProcBands); pb = SpatialDecGetProcessingBand(maxHybBand, self->mapHybBands2ProcBands);
for (qs = startHybBand; qs <= maxHybBand; qs++) { for (qs = startHybBand; qs <= maxHybBand; qs++) {
pb = SpatialDecGetProcessingBand(qs, self->mapHybBands2ProcBands); pb = SpatialDecGetProcessingBand(qs, self->mapHybBands2ProcBands);
energy[pb] += energy[pb] =
(fPow2Div2(inputReal[qs] << clz) + fPow2Div2(inputImag[qs] << clz)); fAddSaturate(energy[pb], fPow2Div2(inputReal[qs] << clz) +
fPow2Div2(inputImag[qs] << clz));
} }
pb++; pb++;
@ -1100,7 +1101,7 @@ static INT DuckerCalcEnergy(DUCKER_INSTANCE *const self,
FIXP_DBL nrg = 0; FIXP_DBL nrg = 0;
qs_next = (int)self->qs_next[pb]; qs_next = (int)self->qs_next[pb];
for (; qs < qs_next; qs++) { for (; qs < qs_next; qs++) {
nrg += fPow2Div2(inputReal[qs] << clz); nrg = fAddSaturate(nrg, fPow2Div2(inputReal[qs] << clz));
} }
energy[pb] = nrg; energy[pb] = nrg;
} }
@ -1138,13 +1139,14 @@ static INT DuckerCalcEnergy(DUCKER_INSTANCE *const self,
#else #else
for (qs = startHybBand; qs <= maxHybBand; qs++) { for (qs = startHybBand; qs <= maxHybBand; qs++) {
int pb = SpatialDecGetProcessingBand(qs, self->mapHybBands2ProcBands); int pb = SpatialDecGetProcessingBand(qs, self->mapHybBands2ProcBands);
energy[pb] += energy[pb] =
(fPow2Div2(inputReal[qs] << clz) + fPow2Div2(inputImag[qs] << clz)); fAddSaturate(energy[pb], fPow2Div2(inputReal[qs] << clz) +
fPow2Div2(inputImag[qs] << clz));
} }
for (; qs <= maxHybridBand; qs++) { for (; qs <= maxHybridBand; qs++) {
int pb = SpatialDecGetProcessingBand(qs, self->mapHybBands2ProcBands); 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 */ #endif /* FUNCTION_DuckerCalcEnergy_func4 */
} }
@ -1237,9 +1239,9 @@ static INT DuckerApply(DUCKER_INSTANCE *const self,
tmp1 = scaleValue(tmp1, scaleSmoothDirRevNrg_asExponent); tmp1 = scaleValue(tmp1, scaleSmoothDirRevNrg_asExponent);
tmp2 = scaleValue(tmp2, 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); 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); DUCK_ONE_MINUS_ALPHA_X4_FDK);
} else { } else {
tmp1 = fMultAddDiv2(tmp1, directNrg[pb], DUCK_ONE_MINUS_ALPHA_X4_FDK); tmp1 = fMultAddDiv2(tmp1, directNrg[pb], DUCK_ONE_MINUS_ALPHA_X4_FDK);