1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-22 13:37:43 +01:00

341 Commits

Author SHA1 Message Date
liuchao
ef9be61680 Merge "Fix not properly handled NULL-pointer access before check in aac lib" am: b0af861f5a
am: b0f6b2906e

Change-Id: I06232a0b0126349e7d4cffff0d9c1eac90eddbb2
2017-02-23 21:48:07 +00:00
liuchao
b0f6b2906e Merge "Fix not properly handled NULL-pointer access before check in aac lib"
am: b0af861f5a

Change-Id: Id59fd9de48f99c572fa964d7e60b57312edadece
2017-02-23 21:45:43 +00:00
Treehugger Robot
b0af861f5a Merge "Fix not properly handled NULL-pointer access before check in aac lib" 2017-02-23 21:25:44 +00:00
liuchao
64bd48e21b Fix not properly handled NULL-pointer access before check in aac lib
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-23 14:22:01 +08:00
Jakub Pawlowski
30fa0b87e9 Merge "Linux compilation fix" am: b82c85d0b1 am: 7c8dd3bb93
am: f4bd5f6bd4

Change-Id: I4f054be1c1342296c69748c2e616b07c7bd9401c
2017-02-21 20:58:55 +00:00
Jakub Pawlowski
f4bd5f6bd4 Merge "Linux compilation fix" am: b82c85d0b1
am: 7c8dd3bb93

Change-Id: Ifba0bf717a42c3889ea686d1f46cd0758e61851e
2017-02-21 20:56:55 +00:00
Jakub Pawlowski
7c8dd3bb93 Merge "Linux compilation fix"
am: b82c85d0b1

Change-Id: I934d6c1b7011453b71c28c9ec64da3f3af865782
2017-02-21 20:53:55 +00:00
Treehugger Robot
b82c85d0b1 Merge "Linux compilation fix" 2017-02-21 20:48:23 +00:00
Jakub Pawlowski
2cd9fe3964 Linux compilation fix
Test: manual
Change-Id: Ie374e47b93e8fa3a44c731cb73f7e151d265c74c
2017-02-21 10:43:02 -08:00
Pavlin Radoslavov
dfc9132496 Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b410 am: 2eba55c5a8 am: 1679274c9c
am: 4910e5a352

Change-Id: I06e73ca6768323110b658548a189a1f69695cc08
2017-01-20 02:35:09 +00:00
Pavlin Radoslavov
4910e5a352 Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b410 am: 2eba55c5a8
am: 1679274c9c

Change-Id: I17c2d7f5c558e17fc4b579d879160f4d6a6ce587
2017-01-20 02:19:38 +00:00
Pavlin Radoslavov
1679274c9c Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b410
am: 2eba55c5a8

Change-Id: I16c8e041daad6f21dd80ec50db52ae488f1b91c5
2017-01-20 02:11:06 +00:00
Pavlin Radoslavov
2eba55c5a8 Merge "Change build config of aac from Android.mk to Android.bp"
am: 8334e4b410

Change-Id: I770984561bf97b52e50c83844f4037fccabfdedc
2017-01-20 02:02:27 +00:00
Treehugger Robot
8334e4b410 Merge "Change build config of aac from Android.mk to Android.bp" 2017-01-20 01:50:48 +00:00
Pavlin Radoslavov
6cc0003b74 Change build config of aac from Android.mk to Android.bp
* 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-19 13:10:11 -08:00
Martin Storsjo
74c1a2a4f8 Update the changelog for the upcoming 0.1.5 release v0.1.5 2017-01-11 10:45:23 +02:00
Martin Storsjo
bf64cd3964 Merge remote-tracking branch 'aosp/master' 2017-01-04 08:49:09 +02:00
Martin Storsjo
5fd7e6537d Merge remote-tracking branch 'aosp/master' 2016-10-28 10:26:20 +03:00
Martin Storsjo
889731b62d Merge "Remove redundant register storage class specifiers" am: ed91226cec am: 664e5f2794 am: bfba552d9e
am: de03facdb2

Change-Id: Iaeb5b599896e4c640b8902c26cc6e3f7405a1256
2016-10-28 01:27:58 +00:00
Martin Storsjo
de03facdb2 Merge "Remove redundant register storage class specifiers" am: ed91226cec am: 664e5f2794
am: bfba552d9e

Change-Id: I02d87c067cdcea95ce7ee207da15bf85d5a21e89
2016-10-28 01:23:28 +00:00
Martin Storsjo
bfba552d9e Merge "Remove redundant register storage class specifiers" am: ed91226cec
am: 664e5f2794

Change-Id: I9d17d79e37bac378e853d6102b26a8c354790957
2016-10-28 01:18:57 +00:00
Martin Storsjo
664e5f2794 Merge "Remove redundant register storage class specifiers"
am: ed91226cec

Change-Id: Ieb0f6090190d7cd2d21599f9b1e6ce950608313d
2016-10-28 01:14:27 +00:00
Treehugger Robot
ed91226cec Merge "Remove redundant register storage class specifiers" 2016-10-28 01:08:50 +00:00
Martin Storsjo
6ec082c6c3 Remove redundant register storage class specifiers
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-18 09:22:55 +03:00
Martin Storsjo
2b1e8db04d Don't force C++98 mode any longer
The code builds fine in C++11 mode now.
2016-10-18 08:29:04 +03:00
Martin Storsjo
55554d0b2d Merge remote-tracking branch 'aosp/master' 2016-10-18 08:28:51 +03:00
Martin Storsjo
6085e575ca Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8 am: 515fb25ef7
am: 8124c22bb7

Change-Id: I49295c5d3cba3a7f97c9d9494df59f460c2c195a
2016-10-18 03:25:40 +00:00
Martin Storsjo
8124c22bb7 Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8
am: 515fb25ef7

Change-Id: Ic97d0e64efee960f87b2cb7581666b2af05873cd
2016-10-18 03:18:40 +00:00
Martin Storsjo
515fb25ef7 Merge "Add casts to avoid errors due to narrowing"
am: 4556cb9cb8

Change-Id: I4cb4a7dace03c7c09403588da05ea8df0f35077e
2016-10-18 03:12:10 +00:00
Treehugger Robot
4556cb9cb8 Merge "Add casts to avoid errors due to narrowing" 2016-10-18 03:05:51 +00:00
Martin Storsjo
6d7d5013ea Add casts to avoid errors due to narrowing
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-10-17 10:32:24 +03:00
Martin Storsjo
cb57d89522 Add new files to "make dist" 2016-09-24 13:36:43 +03:00
Martin Storsjo
72037da0ba Fix building with MSVC for ARM
cmnintrin.h only existed for Windows CE, and doesn't seem to actually
be necessary for building this.
2016-09-11 13:28:47 +03:00
Martin Storsjo
45915b67e4 Detect MSVC x64 2016-09-11 13:28:44 +03:00
opcodevoid
6ac0611b07 Windows MSVC Makefile 2016-09-11 13:28:30 +03:00
Martin Storsjo
5eb3c9be88 Merge remote-tracking branch 'aosp/master' 2016-09-10 14:38:15 +03:00
Lexyan
1d686c3a23 Add aarch64 assembly optimization (ARMv8a 64 bits)
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-10 14:33:39 +03:00
Jean-Michel Trivi
43585d3f18 Merge "Avoid a warning about extra parentheses" am: f935254cc9 am: 899335d310 am: 79c3cd8b1a
am: ca6ae4ffe4

Change-Id: Ia6bbf7532c0058ae716f6243fadf66b032fd7e7b
2016-09-09 22:22:40 +00:00
Jean-Michel Trivi
ca6ae4ffe4 Merge "Avoid a warning about extra parentheses" am: f935254cc9 am: 899335d310
am: 79c3cd8b1a

Change-Id: Ia7a3b896268f11c5c2003c36aa38724910b08db0
2016-09-09 22:18:35 +00:00
Jean-Michel Trivi
79c3cd8b1a Merge "Avoid a warning about extra parentheses" am: f935254cc9
am: 899335d310

Change-Id: Iff4192d216e3ebeed98bf37d76b892be391ffa02
2016-09-09 22:16:04 +00:00
Jean-Michel Trivi
899335d310 Merge "Avoid a warning about extra parentheses"
am: f935254cc9

Change-Id: I838bc99ee6450cdf300663f3a1c356e5cacf517f
2016-09-09 22:13:04 +00:00
Jean-Michel Trivi
f935254cc9 Merge "Avoid a warning about extra parentheses" 2016-09-09 22:06:10 +00:00
Martin Storsjo
ebb66ffd4a Avoid a warning about extra parentheses
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-30 09:57:04 +03:00
Martin Storsjo
a0bd8aa3b6 Bump the package version to 0.1.5 2016-08-25 22:20:09 +03:00
Martin Storsjo
932fc12396 Update Makefile.am with newly added and removed files 2016-08-25 22:14:25 +03:00
Martin Storsjo
1ce312b1dc Bump the library versions in the headers 2016-08-25 22:13:16 +03:00
Martin Storsjo
f9d0f65e65 Merge remote-tracking branch 'aosp/master' 2016-08-25 22:12:15 +03:00
Glenn Kasten
2fc642731f Fix build warning
Bug: 28026175
Change-Id: Ie8d84f694fcb788e5fb8780b11fa07bb98097ce0
2016-08-23 10:25:28 -07:00
Glenn Kasten
2504f60434 Remove redundant parentheses around == comparison operator
Bug: 28026175
Change-Id: I61be1ab98d7279d09250ea4b810c5f31886da048
2016-08-16 14:06:20 -07:00
Martin Storsjo
15b128dd82 Explicitly force building in C++98 mode
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.
2016-05-18 10:13:31 +03:00