fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-09 16:18:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'aosp/master'

Browse Source
This commit is contained in:
Martin Storsjo 2018-03-06 12:20:17 +02:00
commit 29979abe7d
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Android.bp
View File

@ -1,5 +1,6 @@
cc_library_static { cc_library_static {
name: "libFraunhoferAAC", name: "libFraunhoferAAC",
vendor_available: true,
srcs: [ srcs: [
"libAACdec/src/*.cpp", "libAACdec/src/*.cpp",
"libAACenc/src/*.cpp", "libAACenc/src/*.cpp",
@ -12,6 +13,8 @@ cc_library_static {
"libSBRenc/src/*.cpp", "libSBRenc/src/*.cpp",
], ],
cflags: [ cflags: [
"-Werror",
"-Wno-constant-conversion",
"-Wno-sequence-point", "-Wno-sequence-point",
"-Wno-extra", "-Wno-extra",
"-Wno-#warnings", "-Wno-#warnings",

2
OWNERS Normal file
View File

@ -0,0 +1,2 @@
jmtrivi@google.com
gkasten@android.com

2
libAACenc/src/adj_thr.cpp
View File

@ -958,7 +958,7 @@ static FIXP_DBL FDKaacEnc_calcChaosMeasure(PSY_OUT_CHANNEL *psyOutChannel,
CalcInvLdData( (((CalcLdData(frameFormFactor)>>1) - CalcInvLdData( (((CalcLdData(frameFormFactor)>>1) -
(CalcLdData(frameEnergy)>>(2+1))) - (CalcLdData(frameEnergy)>>(2+1))) -
(fMultDiv2(FL2FXCONST_DBL(0.75f),CalcLdData((FIXP_DBL)frameNLines<<(DFRACT_BITS-1-SCALE_NLINES))) - (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 ); )<<1 );
} else { } else {