Marco Nelissen
106fb85b42
am 9f42dfb7: am b3c5a4bb: Fix crash on invalid channel config
...
* commit '9f42dfb7990a107da23454669459bb5e28d90726':
Fix crash on invalid channel config
2015-09-15 02:12:36 +00:00
Marco Nelissen
9f42dfb799
am b3c5a4bb: Fix crash on invalid channel config
...
* commit 'b3c5a4bb8442ab3158fa1f52b790fadc64546f46':
Fix crash on invalid channel config
2015-09-15 01:10:04 +00:00
Marco Nelissen
b3c5a4bb84
Fix crash on invalid channel config
...
Bug: 23876444
Change-Id: I90ad197811ebabceb5b5d74d6d3f20716fbe2d45
2015-09-08 15:50:08 +00:00
Dan Willemsen
8e8d920708
am 9f1b9bb7: (-s ours) am 5e7b21bb: Merge "build: wildcard isn\'t guaranteed to be sorted"
...
* commit '9f1b9bb71019b9a773d847cec6f10c198cd6c459':
2015-08-27 05:10:06 +00:00
Jasper Lievisse Adriaanse
2585f10da2
Fix the preprocessor statements controlling the use of mips{32,64}r1 instructions.
...
Only enable code using mips32/mips64 instructions if the compiler is targetting
this ISA. (integer madd and msub instructions aren't available in the
``canonical'' mips ISAs)
2015-08-13 10:53:07 +02:00
Dan Willemsen
ba8b18e1e8
am 5e7b21bb: Merge "build: wildcard isn\'t guaranteed to be sorted"
...
* commit '5e7b21bb954dcf74533a1725be62cf6bffcb34ce':
build: wildcard isn't guaranteed to be sorted
2015-08-12 00:39:30 +00:00
Dan Willemsen
9f1b9bb710
am 5e7b21bb: Merge "build: wildcard isn\'t guaranteed to be sorted"
...
* commit '5e7b21bb954dcf74533a1725be62cf6bffcb34ce':
build: wildcard isn't guaranteed to be sorted
2015-08-12 00:39:04 +00:00
Dan Willemsen
5e7b21bb95
Merge "build: wildcard isn't guaranteed to be sorted"
2015-08-12 00:24:06 +00:00
Dan Willemsen
f170f89906
build: wildcard isn't guaranteed to be sorted
...
To prevent this from changing between builds, wrap in $(sort )
Change-Id: I0571d7d8787a40ca107c7c735d79692d27bed06e
2015-08-07 13:51:09 -07:00
Martin Storsjo
83ac4a9860
Merge remote-tracking branch 'aosp/master'
2015-03-11 16:49:43 +02:00
Martin Storsjo
2ded8da912
Update the changelog for the upcoming 0.1.4 release
2015-03-05 10:26:54 +02:00
Martin Storsjo
d7fca408b4
Merge remote-tracking branch 'aosp/master'
2015-03-03 10:52:42 +02:00
Bill Yi
267940f5bd
am f2df045a: Merge commit \'10d211b84a5f0790b28fcc8b3db66884d5f9c729\' into HEAD
...
* commit 'f2df045ae92ee655481f73b19986084308ae684c':
2015-02-20 00:22:52 +00:00
Bill Yi
f2df045ae9
Merge commit '10d211b84a5f0790b28fcc8b3db66884d5f9c729' into HEAD
2015-02-19 14:30:49 -08:00
Chih-Hung Hsieh
bd8021bef1
am 2b6bf8dc: Merge "Do not include genericStds_linux.cpp."
...
* commit '2b6bf8dc0941f3a4531030b950cf24fd31248b0b':
Do not include genericStds_linux.cpp.
2015-02-18 02:53:59 +00:00
Chih-Hung Hsieh
2b6bf8dc09
Merge "Do not include genericStds_linux.cpp."
2015-02-18 02:41:47 +00:00
Chih-Hung Hsieh
09f1d04467
Do not include genericStds_linux.cpp.
...
The __aeabi_memcpy functions are already defined in Android libc.
Redefining them to call memcpy will become recursive when clang/llvm
converts the memcpy call to __aeabi_memcpy.
With this change, we can enable clang/llvm by removing LOCAL_CLANG from Android.mk.
BUG: 12216385
Change-Id: I8b8b4ba7f3ff1e66f8110fc3b6356865a582c1d8
2015-02-12 11:20:14 -08:00
Marco Nelissen
10d211b84a
am 1c6ab7db: Merge "Use gcc for the AAC decoder"
...
* commit '1c6ab7db30867f3eee0d550adb015b340fbbc668':
Use gcc for the AAC decoder
2015-02-11 01:51:25 +00:00
Marco Nelissen
1c6ab7db30
Merge "Use gcc for the AAC decoder"
2015-02-11 01:22:20 +00:00
Marco Nelissen
355baa79bf
Use gcc for the AAC decoder
...
clang generates crashing code for this.
Change-Id: I90355d6735403290e7c0d93ff4854520b7b80f4a
2015-02-10 15:39:28 -08:00
Chih-Hung Hsieh
28e448bb55
am 66091e46: Merge "Fix checks for {Front,Side,Back}ElementIsCpe"
...
* commit '66091e46d7aae1b45ed96f5f39274954a296db71':
Fix checks for {Front,Side,Back}ElementIsCpe
2014-12-01 19:45:05 +00:00
Chih-Hung Hsieh
66091e46d7
Merge "Fix checks for {Front,Side,Back}ElementIsCpe"
2014-12-01 19:31:58 +00:00
Dan Albert
57f76311ba
am 84851b23: Merge "Move back to C++98."
...
* commit '84851b23d6f65ce03da4fa8ef2348b4f46c0ed0f':
Move back to C++98.
2014-12-01 19:27:01 +00:00
Chih-Hung Hsieh
bb1e78a118
Fix checks for {Front,Side,Back}ElementIsCpe
...
{Front,Side,Back}ElementIsCpe is an array (per-channel). The check for
pPce->{Front,Side,Back}ElementIsCpe without an index checks the address
of the array, and will always evaluate to true. The elTagSce++
statements are unreachable.
Change-Id: If530371788a44038c500d6f9f7ac67681f77cc71
2014-12-01 11:26:03 -08:00
Dan Albert
84851b23d6
Merge "Move back to C++98."
2014-12-01 19:15:30 +00:00
Dan Albert
d52f374768
Move back to C++98.
...
This code depends on narrowing hex literals to a signed long, which
trips -Wc++11-narrowing (the fix would be to explicitly cast each
value to signed).
Change-Id: I581a02ef0eeee5a2d95ce0ff2ec6f7ff26f3a074
2014-11-28 13:56:59 -08:00
Andrew Stone
97b382cd3f
Ignore file `compile` that is generated by autogen
2014-11-24 16:13:15 -05:00
Martin Storsjo
06ee7ef4e7
Bump the package version number to 0.1.4
2014-11-07 09:33:28 +02:00
Martin Storsjo
a0bfb7ee7c
Bump the shared library major number
...
The AAC_PCM_OUTPUT_CHANNELS option no longer exists under the
same name nor enum value any longer, and the AUDIO_CHANNEL_TYPE
enum has been changed in a way which may break users.
2014-11-07 09:33:28 +02:00
Martin Storsjo
63447a9993
Include the decoder API version in the public header
2014-11-07 09:33:28 +02:00
Martin Storsjo
69a488faf2
Include the new file limiter.cpp in the build
2014-11-07 09:33:28 +02:00
Martin Storsjo
6ccecbc4b0
Merge remote-tracking branch 'aosp/master'
2014-11-07 09:32:48 +02:00
Martin Storsjo
ce1863444a
Include libFDK ppc headers in make dist
2014-11-04 23:48:42 +02:00
Chih-Hung Hsieh
1c7368d7c0
am d149516e: am 7e464956: Merge "Move Clang only flags into LOCAL_CLANG_CPPFLAGS."
...
* commit 'd149516e1a3a63549d2c654b1398544d5de46a3e':
2014-10-25 19:54:26 +00:00
Chih-Hung Hsieh
d149516e1a
am 7e464956: Merge "Move Clang only flags into LOCAL_CLANG_CPPFLAGS."
...
* commit '7e46495606bd66973a10565f932acee7bddcc003':
Move Clang only flags into LOCAL_CLANG_CPPFLAGS.
2014-09-23 16:54:56 +00:00
Chih-Hung Hsieh
ab33d4d394
am 7e464956: Merge "Move Clang only flags into LOCAL_CLANG_CPPFLAGS."
...
* commit '7e46495606bd66973a10565f932acee7bddcc003':
Move Clang only flags into LOCAL_CLANG_CPPFLAGS.
2014-09-23 16:54:34 +00:00
Chih-Hung Hsieh
7e46495606
Merge "Move Clang only flags into LOCAL_CLANG_CPPFLAGS."
2014-09-23 16:29:42 +00:00
Chih-Hung Hsieh
3c4c8d631f
Move Clang only flags into LOCAL_CLANG_CPPFLAGS.
...
Gcc does not recognize -Wno-pointer-bool-conversion.
Change-Id: Ib6ffa321fff1947b6a098244f7d67fdeb45c2b41
2014-09-22 22:59:03 -07:00
Glenn Kasten
57daefcbe1
am 4803bf75: Merge "Ignore Clang warning on checking address of arrays."
...
* commit '4803bf75f564e5c9304527a5b902711f78e9f621':
Ignore Clang warning on checking address of arrays.
2014-09-09 17:53:16 +00:00
Glenn Kasten
4803bf75f5
Merge "Ignore Clang warning on checking address of arrays."
2014-09-09 17:36:03 +00:00
Chih-Hung Hsieh
9428e080cc
Ignore Clang warning on checking address of arrays.
...
BUG: 17356808
Change-Id: I464ffcfb3fc4f44ac8115f9ae98a8c46189b41cd
2014-09-03 12:40:41 -07:00
Keun-young Park
8d8580c267
am 2decc778: Merge "[MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6"
...
* commit '2decc77814e729df47464a504123f9b398ac7077':
[MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6
2014-08-14 18:42:23 +00:00
Keun-young Park
2decc77814
Merge "[MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6"
2014-08-14 16:10:21 +00:00
Martin Storsjo
9a3234055a
Extend the GetInvInt table to 80 elements
...
This is a bug fix patch from Fraunhofer, amending/replacing/extending
the previous commit which only extended the table to 55 elements.
(In my previous fix, 55 seemed to be enough for the issue at hand at
least. A few of the coefficients had slightly different rounding than
what Fraunhofer had used though).
This will show up in AOSP in the next code drop as well.
2014-08-01 10:36:54 +03:00
Duane Sand
5c51a5898e
[MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6
...
Change-Id: I3dacd96cf9d5cf9c3d34d612ebb0456d64bc23bc
2014-07-31 15:40:38 -07:00
Martin Storsjo
6522e87ad6
Extend GetInvInt to support values up to 54
...
For sample rates >= 64 kHz with short blocks, the largest sfb
width is 36, which after grouping can be multiplied with 3,
ending up as 108. GetInvInt needs to be able to support
the largest grouped sfb width, divided by two (3 * 36 / 2 = 54).
This fixes VBR encoding with sample rates >= 64 kHz.
2014-07-29 15:00:56 +03:00
Martin Storsjo
f82510410d
Add support for waveformatex files
...
This is used for multichannel wave files.
2014-06-23 10:45:50 +03:00
Martin Storsjo
16f75a570e
Support reading sox style piped wav files
...
Sox writes the RIFF header size as a very large number, instead
of as 0 as in libavformat.
2014-06-23 10:45:50 +03:00
Martin Storsjo
43cb942cd4
Use skip instead of fseek
...
fseek(SEEK_CUR) doesn't work for nonseekable streams (such
as pipes).
Only do this for skipping past small chunks; don't use it for
skipping past the actual data for non-streamed input.
2014-06-23 10:45:50 +03:00
Martin Storsjo
cb19aa7c12
Allow reading wav files with a 0 bytes RIFF chunk
...
This is required in order to read streamed wav files produced by
the libavformat wav muxer.
2014-06-23 10:45:50 +03:00