diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-05-01 00:23:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-01 00:23:27 +0000 |
| commit | 03b6777510fe58826f8e737baa934ceec0cedfa8 (patch) | |
| tree | 7ff384d92bb6caf2ad80e9b9702366ab639a95c2 | |
| parent | 3124e44e6e9bc84d998c85c10c9f2a1e5ae6b71c (diff) | |
| parent | 4c350fc3fcbdddd8d1d1057fb2156650e74d4402 (diff) | |
| download | fdk-aac-03b6777510fe58826f8e737baa934ceec0cedfa8.tar.gz fdk-aac-03b6777510fe58826f8e737baa934ceec0cedfa8.tar.bz2 fdk-aac-03b6777510fe58826f8e737baa934ceec0cedfa8.zip | |
Merge "Avoid signed integer overflow in combineSignalCplxScale2()." into sc-dev am: ab332a940d am: 4c350fc3fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14387474
Change-Id: I65ab34b1b25c999fded1364e430a914753e377c5
| -rw-r--r-- | libSACdec/src/sac_stp.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libSACdec/src/sac_stp.cpp b/libSACdec/src/sac_stp.cpp index b328c82..be332c7 100644 --- a/libSACdec/src/sac_stp.cpp +++ b/libSACdec/src/sac_stp.cpp @@ -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++; } |