diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-26 18:07:32 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-26 18:07:32 -0800 |
| commit | 350e4ffea2b756a40a124db5ba341257299f1e3f (patch) | |
| tree | f2b810e25e0c6dab8f58ac0672823092ee647171 /libAACdec | |
| parent | f69ca4c61480acd4248aa4975ef205e1a96eaa3f (diff) | |
| parent | 8879fb1fd6bc6f7840b92a1bc78b33d0a3f3f9ef (diff) | |
| download | fdk-aac-350e4ffea2b756a40a124db5ba341257299f1e3f.tar.gz fdk-aac-350e4ffea2b756a40a124db5ba341257299f1e3f.tar.bz2 fdk-aac-350e4ffea2b756a40a124db5ba341257299f1e3f.zip | |
Merge "Signed Integer Overflow in CLpd_FAC_Acelp2Mdct()" am: 3bb4fe68a6
am: 8879fb1fd6
Change-Id: I955c6e7d250ac52986aeb0879dad976dd62d3fab
Diffstat (limited to 'libAACdec')
| -rw-r--r-- | libAACdec/src/usacdec_fac.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libAACdec/src/usacdec_fac.cpp b/libAACdec/src/usacdec_fac.cpp index 6b595d4..25d3119 100644 --- a/libAACdec/src/usacdec_fac.cpp +++ b/libAACdec/src/usacdec_fac.cpp @@ -538,7 +538,7 @@ INT CLpd_FAC_Acelp2Mdct(H_MDCT hMdct, FIXP_DBL *output, FIXP_DBL *_pSpec, if (total_gain != (FIXP_DBL)0) { scaleValuesWithFactor(pSpec, total_gain, tl, spec_scale[0] + scale); } else { - scaleValues(pSpec, tl, spec_scale[0] + scale); + scaleValuesSaturate(pSpec, tl, spec_scale[0] + scale); } 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) { scaleValuesWithFactor(pSpec, total_gain, tl, spec_scale[w] + scale); } else { - scaleValues(pSpec, tl, spec_scale[w] + scale); + scaleValuesSaturate(pSpec, tl, spec_scale[w] + scale); } if (noOutSamples <= nrSamples) { |