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

Merge "Avoid signed integer overflow in combineSignalCplxScale2()." into sc-dev am: ab332a940d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387474

Change-Id: I88ee25478125c79da035237e4f1835df9f99020b
This commit is contained in:
TreeHugger Robot 2021-05-01 00:15:35 +00:00 committed by Automerger Merge Worker
parent 740116e266 ab332a940d
commit 24e69d4552
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libSACdec/src/sac_stp.cpp
View File

@ -252,12 +252,15 @@ inline void combineSignalCplxScale2(FIXP_DBL *hybOutputRealDry,
int n;
for (n = bands - 1; n >= 0; n--) {
*hybOutputRealDry =
*hybOutputRealDry +
(fMultDiv2(*hybOutputRealWet, scaleX) << (SF_SCALE + 1));
*hybOutputImagDry =
*hybOutputImagDry +
(fMultDiv2(*hybOutputImagWet, scaleX) << (SF_SCALE + 1));
*hybOutputRealDry = SATURATE_LEFT_SHIFT(
(*hybOutputRealDry >> 1) +
(fMultDiv2(*hybOutputRealWet, scaleX) << SF_SCALE),
1, DFRACT_BITS);
*hybOutputImagDry = SATURATE_LEFT_SHIFT(
(*hybOutputImagDry >> 1) +
(fMultDiv2(*hybOutputImagWet, scaleX) << SF_SCALE),
1, DFRACT_BITS);
;
hybOutputRealDry++, hybOutputRealWet++;
hybOutputImagDry++, hybOutputImagWet++;
}