commit dfc913249657ddb9b10369bcf503d0b151b9afa6
author Pavlin Radoslavov <pavlin@google.com> Fri Jan 20 02:35:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 20 02:35:09 2017 +0000
tree 760735b496e4bbe6a41199c91721456581b5cb70
parent 889731b62d694bf8bc7a6fd28a6b97b8755ec902
parent 4910e5a3520d92c4e6d37bfabc833771e7f02243

Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b410 am: 2eba55c5a8 am: 1679274c9c
am: 4910e5a352

Change-Id: I06e73ca6768323110b658548a189a1f69695cc08

libAACenc/src/adj_thr.cpp

diff --git a/libAACenc/src/adj_thr.cpp b/libAACenc/src/adj_thr.cpp
index a79a9ae..09584f4 100644
--- a/libAACenc/src/adj_thr.cpp
+++ b/libAACenc/src/adj_thr.cpp
@@ -958,7 +958,7 @@
            CalcInvLdData( (((CalcLdData(frameFormFactor)>>1) -
                             (CalcLdData(frameEnergy)>>(2+1))) -
                            (fMultDiv2(FL2FXCONST_DBL(0.75f),CalcLdData((FIXP_DBL)frameNLines<<(DFRACT_BITS-1-SCALE_NLINES))) -
-                            (((FIXP_DBL)(SCALE_FORM_FAC-SCALE_NRGS_SQRT4+FORM_FAC_SHIFT-(SCALE_NLINES_P34))<<(DFRACT_BITS-1-LD_DATA_SHIFT))>>1))
+                            (((FIXP_DBL)(-((-SCALE_FORM_FAC+SCALE_NRGS_SQRT4-FORM_FAC_SHIFT+SCALE_NLINES_P34) << (DFRACT_BITS-1-LD_DATA_SHIFT))))>>1))
                           )<<1 );
   } else {