Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()"

am: d2be744af2

Change-Id: I780b6c3791bd9bc70fa11a6990cb95a2e5d5ae7c
This commit is contained in:
Fraunhofer IIS FDK 2018-11-29 10:56:23 -08:00 committed by android-build-merger
commit 6e4fe2e06b
1 changed files with 5 additions and 3 deletions

View File

@ -216,6 +216,7 @@ int InvMdctTransformLowDelay_fdk(FIXP_DBL *mdctData, const int mdctData_e,
int scale = mdctData_e + MDCT_OUT_HEADROOM -
LDFB_HEADROOM; /* The LDFB_HEADROOM is compensated inside
multE2_DinvF_fdk() below */
int i;
/* Select LD window slope */
switch (N) {
@ -261,10 +262,11 @@ int InvMdctTransformLowDelay_fdk(FIXP_DBL *mdctData, const int mdctData_e,
}
if (gain != (FIXP_DBL)0) {
scaleValuesWithFactor(mdctData, gain, N, scale);
} else {
scaleValues(mdctData, N, scale);
for (i = 0; i < N; i++) {
mdctData[i] = fMult(mdctData[i], gain);
}
}
scaleValuesSaturate(mdctData, N, scale);
/* Since all exponent and factors have been applied, current exponent is zero.
*/