summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-02-23Merge "Fix not properly handled NULL-pointer access before check in aac lib" ↵liuchao2-19/+10
am: b0af861f5a am: b0f6b2906e Change-Id: I06232a0b0126349e7d4cffff0d9c1eac90eddbb2
2017-02-23Merge "Fix not properly handled NULL-pointer access before check in aac lib"liuchao2-19/+10
am: b0af861f5a Change-Id: Id59fd9de48f99c572fa964d7e60b57312edadece
2017-02-23Merge "Fix not properly handled NULL-pointer access before check in aac lib"Treehugger Robot2-19/+10
2017-02-23Fix not properly handled NULL-pointer access before check in aac libliuchao2-19/+10
1) Fixes some potential NULL-pointer access in case input pointer is passed NULL 2) Modified some for lazy init Test: mm -j 8 Change-Id: I7fca97e1d9f70d8e8c1533b519181af35a5468f7
2017-02-21Merge "Linux compilation fix" am: b82c85d0b1 am: 7c8dd3bb93Jakub Pawlowski1-0/+4
am: f4bd5f6bd4 Change-Id: I4f054be1c1342296c69748c2e616b07c7bd9401c
2017-02-21Merge "Linux compilation fix" am: b82c85d0b1Jakub Pawlowski1-0/+4
am: 7c8dd3bb93 Change-Id: Ifba0bf717a42c3889ea686d1f46cd0758e61851e
2017-02-21Merge "Linux compilation fix"Jakub Pawlowski1-0/+4
am: b82c85d0b1 Change-Id: I934d6c1b7011453b71c28c9ec64da3f3af865782
2017-02-21Merge "Linux compilation fix"Treehugger Robot1-0/+4
2017-02-21Linux compilation fixJakub Pawlowski1-0/+4
Test: manual Change-Id: Ie374e47b93e8fa3a44c731cb73f7e151d265c74c
2017-01-20Merge "Change build config of aac from Android.mk to Android.bp" am: ↵Pavlin Radoslavov2-59/+32
8334e4b410 am: 2eba55c5a8 am: 1679274c9c am: 4910e5a352 Change-Id: I06e73ca6768323110b658548a189a1f69695cc08
2017-01-20Merge "Change build config of aac from Android.mk to Android.bp" am: ↵Pavlin Radoslavov2-59/+32
8334e4b410 am: 2eba55c5a8 am: 1679274c9c Change-Id: I17c2d7f5c558e17fc4b579d879160f4d6a6ce587
2017-01-20Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b410Pavlin Radoslavov2-59/+32
am: 2eba55c5a8 Change-Id: I16c8e041daad6f21dd80ec50db52ae488f1b91c5
2017-01-20Merge "Change build config of aac from Android.mk to Android.bp"Pavlin Radoslavov2-59/+32
am: 8334e4b410 Change-Id: I770984561bf97b52e50c83844f4037fccabfdedc
2017-01-20Merge "Change build config of aac from Android.mk to Android.bp"Treehugger Robot2-59/+32
2017-01-19Change build config of aac from Android.mk to Android.bpPavlin Radoslavov2-59/+32
* In an effort to modernize build configurations to the new Soong system, we need to upgrade existing Android.mk files to Android.bp * This file is done by using the following steps: 1. Manually removing all *_sources from Android.mk, because of the unusual make logic they use 2. Running the auto-conversion tool: androidmk Android.mk > Android.bp 3. Editing the result Android.bp: 3.1. Writing the "srcs" list 3.2. Removing the escaping around -Wno-#warnings in cflags, because those are not needed anymore 3.3. Renamed local_include_dirs to export_include_dirs to facilititate the inclusion of header files. It appears users of libFraunhoferAAC are using header files from all include directories, hence the renaming. Test: Code compilation ("mm" in external/aac, and "make" in top-directory) Bug: b/32958753 b/34454142 Change-Id: Ie89f73722908e8734f4b88f1407952311ec064af
2017-01-11Update the changelog for the upcoming 0.1.5 releaseMartin Storsjo1-0/+8
2017-01-04Merge remote-tracking branch 'aosp/master'Martin Storsjo0-0/+0
2016-10-28Merge remote-tracking branch 'aosp/master'Martin Storsjo2-9/+9
2016-10-28Merge "Remove redundant register storage class specifiers" am: ed91226cec ↵Martin Storsjo2-9/+9
am: 664e5f2794 am: bfba552d9e am: de03facdb2 Change-Id: Iaeb5b599896e4c640b8902c26cc6e3f7405a1256
2016-10-28Merge "Remove redundant register storage class specifiers" am: ed91226cec ↵Martin Storsjo2-9/+9
am: 664e5f2794 am: bfba552d9e Change-Id: I02d87c067cdcea95ce7ee207da15bf85d5a21e89
2016-10-28Merge "Remove redundant register storage class specifiers" am: ed91226cecMartin Storsjo2-9/+9
am: 664e5f2794 Change-Id: I9d17d79e37bac378e853d6102b26a8c354790957
2016-10-28Merge "Remove redundant register storage class specifiers"Martin Storsjo2-9/+9
am: ed91226cec Change-Id: Ieb0f6090190d7cd2d21599f9b1e6ce950608313d
2016-10-28Merge "Remove redundant register storage class specifiers"Treehugger Robot2-9/+9
2016-10-18Remove redundant register storage class specifiersMartin Storsjo2-9/+9
Clang warns about this being deprecated, when building without specifying -std=c++98. This doesn't give any measurable encoding speed impact on ARM or AArch64, on neither GCC nor Clang. Change-Id: I63a0bbd1dccb97547522da188ee585d4d8127c29
2016-10-18Don't force C++98 mode any longerMartin Storsjo1-1/+1
The code builds fine in C++11 mode now.
2016-10-18Merge remote-tracking branch 'aosp/master'Martin Storsjo4-30/+28
2016-10-18Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8 am: 515fb25ef7Martin Storsjo4-30/+28
am: 8124c22bb7 Change-Id: I49295c5d3cba3a7f97c9d9494df59f460c2c195a
2016-10-18Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8Martin Storsjo4-30/+28
am: 515fb25ef7 Change-Id: Ic97d0e64efee960f87b2cb7581666b2af05873cd
2016-10-18Merge "Add casts to avoid errors due to narrowing"Martin Storsjo4-30/+28
am: 4556cb9cb8 Change-Id: I4cb4a7dace03c7c09403588da05ea8df0f35077e
2016-10-18Merge "Add casts to avoid errors due to narrowing"Treehugger Robot4-30/+28
2016-10-17Add casts to avoid errors due to narrowingMartin Storsjo4-30/+28
This fixes building in C++11 mode, which normally errors out on narrowing hex literals to signed long. This is similar to what was done in git commit ef30836651 (change id I64d19a8a8059c5a96386b1eaac297fd2469515f8), completing the fix for that category of issues. Change-Id: I1907bc947d43bf44910fb2b34bf2b31c0e53aa53
2016-09-24Add new files to "make dist"Martin Storsjo1-1/+5
2016-09-11Fix building with MSVC for ARMMartin Storsjo2-2/+4
cmnintrin.h only existed for Windows CE, and doesn't seem to actually be necessary for building this.
2016-09-11Detect MSVC x64Martin Storsjo1-1/+1
2016-09-11Windows MSVC Makefileopcodevoid3-0/+1160
2016-09-10Merge remote-tracking branch 'aosp/master'Martin Storsjo1-1/+1
2016-09-10Add aarch64 assembly optimization (ARMv8a 64 bits)Lexyan5-0/+249
The fixmuldiv functions don't need inline assembly to be fast in this architecture; the compiler (both clang and GCC) figure out to use the optimal instructions for this (which is 2 instruction sequence), and when letting the compiler emit the instructions instead of using inline assembly, the compiler is able to interleave those instructions with other instructions, improving scheduling, making it even faster than when using inline assembly. Overall, this gives about 50% speedup.
2016-09-09Merge "Avoid a warning about extra parentheses" am: f935254cc9 am: ↵Jean-Michel Trivi0-0/+0
899335d310 am: 79c3cd8b1a am: ca6ae4ffe4 Change-Id: Ia6bbf7532c0058ae716f6243fadf66b032fd7e7b
2016-09-09Merge "Avoid a warning about extra parentheses" am: f935254cc9 am: 899335d310Jean-Michel Trivi1-1/+1
am: 79c3cd8b1a Change-Id: Ia7a3b896268f11c5c2003c36aa38724910b08db0
2016-09-09Merge "Avoid a warning about extra parentheses" am: f935254cc9Jean-Michel Trivi1-1/+1
am: 899335d310 Change-Id: Iff4192d216e3ebeed98bf37d76b892be391ffa02
2016-09-09Merge "Avoid a warning about extra parentheses"Jean-Michel Trivi1-1/+1
am: f935254cc9 Change-Id: I838bc99ee6450cdf300663f3a1c356e5cacf517f
2016-09-09Merge "Avoid a warning about extra parentheses"Jean-Michel Trivi1-1/+1
2016-08-30Avoid a warning about extra parenthesesMartin Storsjo1-1/+1
This fixes the following warning: libSBRenc/src/sbr_encoder.cpp:1942:14: warning: equality comparison with extraneous parentheses [-Wparentheses-equality] Change-Id: I2c833d19348574473c752076a4efff6642c0d653
2016-08-25Bump the package version to 0.1.5Martin Storsjo1-1/+1
2016-08-25Update Makefile.am with newly added and removed filesMartin Storsjo1-1/+1
2016-08-25Bump the library versions in the headersMartin Storsjo2-2/+2
2016-08-25Merge remote-tracking branch 'aosp/master'Martin Storsjo75-818/+2591
2016-08-23Fix build warningGlenn Kasten1-1/+1
Bug: 28026175 Change-Id: Ie8d84f694fcb788e5fb8780b11fa07bb98097ce0
2016-08-16Remove redundant parentheses around == comparison operatorGlenn Kasten1-1/+1
Bug: 28026175 Change-Id: I61be1ab98d7279d09250ea4b810c5f31886da048
2016-05-18Explicitly force building in C++98 modeMartin Storsjo1-1/+1
GCC 6 defaults to C++14 (or more precisely, gnu++14) instead of C++98 (or gnu++98). The fdk-aac source doesn't support being built in this mode at the moment, since it relies on narrowing conversion from unsigned 32 bit integers to FIXP_DBL (which is a signed data type of the same size). The same approach is used upstream in Android as well, since d52f3747683. This fixes buliding with GCC 6.