fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-16 19:30:34 +01:00
Code Issues Projects Releases Wiki Activity
257 Commits 10 Branches 11 Tags
Commit Graph

257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Martin Storsjo
8fe6faf261 Merge remote-tracking branch 'aosp/master' 2016-05-18 09:36:12 +03:00
Guillaume Smaha
f132ac5f3d Invert inline and void to be compatible with gcc 3.3.4 2016-05-18 08:07:32 +02:00
Guillaume Smaha
112fe2c68d Fix issue with gcc 3.4.3 which doesn't support always_inline without inline 2016-05-17 15:39:10 +02:00
Glenn Kasten
fb66dceae5 Merge "Disable warnings that are not easily fixable" am: 8192b1a am: 2a923c9 
am: 00fc1c6

* commit '00fc1c66d5a524c6961db04d05e1076b18003231':
  Disable warnings that are not easily fixable

Change-Id: Id64b163cd217ad1cbb209843819416f3a8b354b1
 2016-04-20 23:44:28 +00:00
Glenn Kasten
0d9ca2d051 Merge "Add default case for undefined pointer initialization" am: 9d0179c am: 27625f2 
am: c3f7cf7

* commit 'c3f7cf7f1b8987a873ceea8c1b45206dd611e425':
  Add default case for undefined pointer initialization

Change-Id: I11a5787070f3be7f2d476ec1ebd54c1d41ce7dc2
 2016-04-20 23:44:28 +00:00
Glenn Kasten
e95a3bd58f Merge "Left shift of negative int is undefined" am: 6ae5480 am: 2b2e97b 
am: e34e2b9

* commit 'e34e2b9d54680b7d59104b8398d10f6d4d8c5be6':
  Left shift of negative int is undefined

Change-Id: Ic539e64d4cf654b3e8924d6321ac203f4f355a96
 2016-04-20 23:44:27 +00:00
Glenn Kasten
00fc1c66d5 Merge "Disable warnings that are not easily fixable" am: 8192b1a 
am: 2a923c9

* commit '2a923c92869efb277ca7d67ab6c27617ec26c128':
  Disable warnings that are not easily fixable

Change-Id: I920b16bdaa1ce7a00c91e129b950f0d486a1fa37
 2016-04-20 23:40:45 +00:00
Glenn Kasten
c3f7cf7f1b Merge "Add default case for undefined pointer initialization" am: 9d0179c 
am: 27625f2

* commit '27625f27066421ce38250272f4bb751cf6f58c17':
  Add default case for undefined pointer initialization

Change-Id: I601dc2afdfa8db2008628e05068d277a617c022d
 2016-04-20 23:40:45 +00:00
Glenn Kasten
e34e2b9d54 Merge "Left shift of negative int is undefined" am: 6ae5480 
am: 2b2e97b

* commit '2b2e97b893b16b69c7728d16e8653b9c94944294':
  Left shift of negative int is undefined

Change-Id: Ie90b850b7adf787dfb47f8b7c43a22744c3a7fa0
 2016-04-20 23:40:45 +00:00
Glenn Kasten
18a9bb8b6d resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp 
am: 2809968

* commit '28099687b733eac90cff9273b6f8f660176e0784':
  Remove redundant parentheses around == comparison operator

Change-Id: I87566357ee932ac57eed79645fec146625c85cdb
 2016-04-20 23:40:28 +00:00
Glenn Kasten
28099687b7 resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp 
Change-Id: If143807a233d47fb7fd269fd263a8a898109b060
 2016-04-20 16:28:31 -07:00
Glenn Kasten
2a923c9286 Merge "Disable warnings that are not easily fixable" 
am: 8192b1a

* commit '8192b1a98f60cc39253c658ba1ca70a70c2e0dfa':
  Disable warnings that are not easily fixable

Change-Id: I5dc1fabd29cfb7024f8362359a796efd1764032d
 2016-04-20 19:00:07 +00:00
Glenn Kasten
27625f2706 Merge "Add default case for undefined pointer initialization" 
am: 9d0179c

* commit '9d0179c8a85f2b50bafdf6715fc266bc92771756':
  Add default case for undefined pointer initialization

Change-Id: I311521adebb1949747f0cb34bee19a57d8199558
 2016-04-20 19:00:06 +00:00
Glenn Kasten
2b2e97b893 Merge "Left shift of negative int is undefined" 
am: 6ae5480

* commit '6ae54806ab88efd76e884447680fd30b340936fd':
  Left shift of negative int is undefined

Change-Id: If6a4abe686d3ab6b7f825058255b03aa46055484
 2016-04-20 19:00:06 +00:00
Glenn Kasten
ad1e8985d9 Merge "Remove redundant parentheses around == comparison operator" 
am: 34fb053

* commit '34fb05353bbabe1ba04362f26b3ae507fbb687d4':
  Remove redundant parentheses around == comparison operator

Change-Id: I7a37ef8293371cc0287a0e0b9f0115f82f294b31
 2016-04-20 19:00:06 +00:00
Glenn Kasten
8192b1a98f Merge "Disable warnings that are not easily fixable" 2016-04-20 18:45:30 +00:00
Glenn Kasten
9d0179c8a8 Merge "Add default case for undefined pointer initialization" 2016-04-20 18:45:18 +00:00
Glenn Kasten
6ae54806ab Merge "Left shift of negative int is undefined" 2016-04-20 18:45:09 +00:00
Glenn Kasten
34fb05353b Merge "Remove redundant parentheses around == comparison operator" 2016-04-20 18:44:59 +00:00
Android Build Merger (Role)
268c63c4a5 Merge "Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a am: 9d4702f2d9 am: 9000e05228" into nyc-mr1-dev-plus-aosp 2016-04-19 01:37:05 +00:00
Jean-Michel Trivi
e0700da0dd Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a am: 9d4702f2d9 
am: be845a7fc2

* commit 'be845a7fc28b00793a59c3610c9f6ca8cd2e360e':
  Fix aacDecoder_drcExtractAndMap()

Change-Id: Iea260503b4d49014223602830b54b489448d294f
 2016-04-19 01:37:00 +00:00
Jean-Michel Trivi
a5d2c03f7b Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a am: 9d4702f2d9 
am: 9000e05228

* commit '9000e05228a100873606bfc4d758a2390b3eab1d':
  Fix aacDecoder_drcExtractAndMap()

Change-Id: Iad9b7605ceac844b3ad520b51ecac30709a17edc
 2016-04-19 01:37:00 +00:00
Jean-Michel Trivi
be845a7fc2 Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a 
am: 9d4702f2d9

* commit '9d4702f2d9ecec00c4e28de638b1f79afb5d696c':
  Fix aacDecoder_drcExtractAndMap()

Change-Id: I0a57275a4ebc04cc3acafc6a0325b7fefe8e5ef0
 2016-04-19 01:34:40 +00:00