diff options
| author | Martin Storsjo <martin@martin.st> | 2018-03-06 12:20:17 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2018-03-06 12:20:17 +0200 |
| commit | 29979abe7d942846eeafb7d370dab531d175417d (patch) | |
| tree | dfad5b3698a30c325a9ab417b643d96b56b1abca | |
| parent | 89aeea5f292306c429550e4c9fe55d865c903600 (diff) | |
| parent | a3e0aa5f25908d92535e045bbde73c9a3d19adc7 (diff) | |
| download | fdk-aac-29979abe7d942846eeafb7d370dab531d175417d.tar.gz fdk-aac-29979abe7d942846eeafb7d370dab531d175417d.tar.bz2 fdk-aac-29979abe7d942846eeafb7d370dab531d175417d.zip | |
Merge remote-tracking branch 'aosp/master'
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | OWNERS | 2 | ||||
| -rw-r--r-- | libAACenc/src/adj_thr.cpp | 2 |
3 files changed, 6 insertions, 1 deletions
@@ -1,5 +1,6 @@ cc_library_static { name: "libFraunhoferAAC", + vendor_available: true, srcs: [ "libAACdec/src/*.cpp", "libAACenc/src/*.cpp", @@ -12,6 +13,8 @@ cc_library_static { "libSBRenc/src/*.cpp", ], cflags: [ + "-Werror", + "-Wno-constant-conversion", "-Wno-sequence-point", "-Wno-extra", "-Wno-#warnings", @@ -0,0 +1,2 @@ +jmtrivi@google.com +gkasten@android.com 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 @@ static FIXP_DBL FDKaacEnc_calcChaosMeasure(PSY_OUT_CHANNEL *psyOutChannel, 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 { |