| commit | 5be2304ab2a1e40ca85f2c01defa4bb33e8344d9 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Tue Dec 08 20:27:53 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 08 20:27:53 2015 +0000 |
| tree | 406831762e76edbb91629886f4256ead2fab98be | |
| parent | bbe860d522c7ce46eff6de49dab2ff7e4059a3d8 [diff] | |
| parent | 654b4bf34361b0166a564d178c11ce98cf561cfa [diff] |
Merge "Camera: fix HAL1.0 support"
diff --git a/media/libstagefright/codecs/amrwbenc/src/preemph.c b/media/libstagefright/codecs/amrwbenc/src/preemph.c index c867bf7..d113288 100644 --- a/media/libstagefright/codecs/amrwbenc/src/preemph.c +++ b/media/libstagefright/codecs/amrwbenc/src/preemph.c
@@ -71,6 +71,9 @@ L_tmp = L_deposit_h(x[i]); L_tmp -= (x[i - 1] * mu)<<1; L_tmp = (L_tmp << 1); + if (L_tmp > INT32_MAX - 0x8000) { + L_tmp = INT32_MAX - 0x8000; + } x[i] = (L_tmp + 0x8000)>>16; }