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 CLpd_FAC_Acelp2Mdct()" am: 3bb4fe68a6 

am: 8879fb1fd6

Change-Id: I955c6e7d250ac52986aeb0879dad976dd62d3fab
This commit is contained in:
Jean-Michel Trivi 2018-12-26 18:07:32 -08:00 committed by android-build-merger
parent f69ca4c614 8879fb1fd6
commit 350e4ffea2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libAACdec/src/usacdec_fac.cpp
View File

@ -538,7 +538,7 @@ INT CLpd_FAC_Acelp2Mdct(H_MDCT hMdct, FIXP_DBL *output, FIXP_DBL *_pSpec,
if (total_gain != (FIXP_DBL)0) { if (total_gain != (FIXP_DBL)0) {
scaleValuesWithFactor(pSpec, total_gain, tl, spec_scale[0] + scale); scaleValuesWithFactor(pSpec, total_gain, tl, spec_scale[0] + scale);
} else { } else {
scaleValues(pSpec, tl, spec_scale[0] + scale); scaleValuesSaturate(pSpec, tl, spec_scale[0] + scale);
} }
pOut1 += fl / 2 - 1; pOut1 += fl / 2 - 1;
@ -627,7 +627,7 @@ INT CLpd_FAC_Acelp2Mdct(H_MDCT hMdct, FIXP_DBL *output, FIXP_DBL *_pSpec,
if (total_gain != (FIXP_DBL)0) { if (total_gain != (FIXP_DBL)0) {
scaleValuesWithFactor(pSpec, total_gain, tl, spec_scale[w] + scale); scaleValuesWithFactor(pSpec, total_gain, tl, spec_scale[w] + scale);
} else { } else {
scaleValues(pSpec, tl, spec_scale[w] + scale); scaleValuesSaturate(pSpec, tl, spec_scale[w] + scale);
} }
if (noOutSamples <= nrSamples) { if (noOutSamples <= nrSamples) {