diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-26 17:10:27 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-26 17:10:27 -0800 |
| commit | 2ddc635e1dab78b16da93c4e05d46c3d5a260ee7 (patch) | |
| tree | 4f89eeadc3ac325afcd870697a7bf2d4e0d0952f /libAACdec/src/usacdec_lpd.cpp | |
| parent | 1308fe1b8b7491fb6bced3642acf2d34552cdd47 (diff) | |
| parent | f69ca4c61480acd4248aa4975ef205e1a96eaa3f (diff) | |
| download | fdk-aac-2ddc635e1dab78b16da93c4e05d46c3d5a260ee7.tar.gz fdk-aac-2ddc635e1dab78b16da93c4e05d46c3d5a260ee7.tar.bz2 fdk-aac-2ddc635e1dab78b16da93c4e05d46c3d5a260ee7.zip | |
Merge "Signed Integer Overflow in E_UTIL_preemph()" am: aea2558c50 am: b471c2c215
am: f69ca4c614
Change-Id: I78ee4dccc649e0ff2ee4006212795d89c2f8233c
Diffstat (limited to 'libAACdec/src/usacdec_lpd.cpp')
| -rw-r--r-- | libAACdec/src/usacdec_lpd.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libAACdec/src/usacdec_lpd.cpp b/libAACdec/src/usacdec_lpd.cpp index f53e39f..e0a2631 100644 --- a/libAACdec/src/usacdec_lpd.cpp +++ b/libAACdec/src/usacdec_lpd.cpp @@ -418,6 +418,7 @@ void CLpd_AdaptLowFreqDeemph(FIXP_DBL x[], int lg, FIXP_DBL alfd_gains[], FIXP_DBL tmp_pow2[32]; s = s * 2 + ALFDPOW2_SCALE; + s = fMin(31, s); k = 8; i_max = lg / 4; /* ALFD range = 1600Hz (lg = 6400Hz) */ |