Merge "Integer overflow fix in InvMdctTransformLowDelay_fdk()" am: d2be744af2

am: 6e4fe2e06b

Change-Id: Ie017463a9aad54c9b02672c0aa4d1e7f06847427
This commit is contained in:
Fraunhofer IIS FDK 2018-11-29 11:00:16 -08:00 committed by android-build-merger
commit 69e052a1af
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.
*/