commit 6f2e6b252464097cff52f4a8f77cbad1001bfa3a
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 13 16:19:33 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 13 16:19:34 2017 +0000
tree 6746eb791cea0720af5bce507c5af24e236e722a
parent 55498fa33bda72b73c2a28fe9335b9919b6afcc4
parent 7b461f650f5ef86fe267321f5c6e0416ee985a08

Merge "Remove useless code in aacenc"

media/libstagefright/codecs/aacenc/src/grp_data.c

diff --git a/media/libstagefright/codecs/aacenc/src/grp_data.c b/media/libstagefright/codecs/aacenc/src/grp_data.c
index 7861e1c..edfb95b 100644
--- a/media/libstagefright/codecs/aacenc/src/grp_data.c
+++ b/media/libstagefright/codecs/aacenc/src/grp_data.c
@@ -88,7 +88,6 @@
     offset += groupLen[grp] * FRAME_LEN_SHORT;
   }
   groupedSfbOffset[i] = FRAME_LEN_LONG;
-  i += 1;
 
   /* calculate minSnr */
   i = 0;

media/libstagefright/codecs/aacenc/src/ms_stereo.c

diff --git a/media/libstagefright/codecs/aacenc/src/ms_stereo.c b/media/libstagefright/codecs/aacenc/src/ms_stereo.c
index 1e4b227..ca028dc 100644
--- a/media/libstagefright/codecs/aacenc/src/ms_stereo.c
+++ b/media/libstagefright/codecs/aacenc/src/ms_stereo.c
@@ -94,8 +94,6 @@
 
       pnms = fixmul(nrgL, nrgR);
 
-      temp = (pnlr + 1) / ((pnms >> 8) + 1);
-
       temp = pnms - pnlr;
       if( temp > 0 ){