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

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
parent 07ed1f756b 6e4fe2e06b
commit 69e052a1af
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libAACdec/src/ldfiltbank.cpp
View File

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