diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-26 18:18:35 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-26 18:18:35 -0800 |
| commit | 0694a4e1e8ee8223325c67500a7f689a14df0eb1 (patch) | |
| tree | 08364f9e8ae99c6188d85fe531083ebd8b3ee57d /libAACdec | |
| parent | 2ddc635e1dab78b16da93c4e05d46c3d5a260ee7 (diff) | |
| parent | 350e4ffea2b756a40a124db5ba341257299f1e3f (diff) | |
| download | fdk-aac-0694a4e1e8ee8223325c67500a7f689a14df0eb1.tar.gz fdk-aac-0694a4e1e8ee8223325c67500a7f689a14df0eb1.tar.bz2 fdk-aac-0694a4e1e8ee8223325c67500a7f689a14df0eb1.zip | |
Merge "Signed Integer Overflow in CLpd_FAC_Acelp2Mdct()" am: 3bb4fe68a6 am: 8879fb1fd6
am: 350e4ffea2
Change-Id: I5f6e1d37824f13d791edd8433aac9c591bbfc399
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) { |