commit 252f1911d2c26701d8342c77cdfa02c7e10d94a2
author Marco Nelissen <marcone@google.com> Wed Mar 30 14:48:08 2016 -0700
committer Marco Nelissen <marcone@google.com> Fri Jun 03 10:03:33 2016 -0700
tree cd7ab470655cdf02cc8235b8700013f553fcba92
parent e0a6fa055310aac547882aef92c82276d04da9f1

Fix AMRWBEnc overflow

Bug: 27898843
Change-Id: Ibb3506bcfc315b5c816892ba65e157db8ea3fdbe

media/libstagefright/codecs/amrwbenc/src/voAMRWBEnc.c

diff --git a/media/libstagefright/codecs/amrwbenc/src/voAMRWBEnc.c b/media/libstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
index 4cafb01..3bdf93a 100644
--- a/media/libstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
+++ b/media/libstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
@@ -1301,10 +1301,10 @@
 
             for (i = 0; i < L_SUBFR; i++)
             {
-                L_tmp = (code2[i] * gain_code)<<1;
-                L_tmp = (L_tmp << 5);
-                L_tmp += (exc2[i] * gain_pit)<<1;
-                L_tmp = (L_tmp << 1);
+                L_tmp = L_mult(code2[i], gain_code);
+                L_tmp = L_shl(L_tmp, 5);
+                L_tmp = L_add(L_tmp, L_mult(exc2[i], gain_pit));
+                L_tmp = L_shl(L_tmp, 1);
                 exc2[i] = voround(L_tmp);
             }