summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'aosp/master'v0.1.4Martin Storsjo2015-03-110-0/+0
|\
| * Merge commit '10d211b84a5f0790b28fcc8b3db66884d5f9c729' into HEADBill Yi2015-02-190-0/+0
| |\
| | * am 1c6ab7db: Merge "Use gcc for the AAC decoder"Marco Nelissen2015-02-111-0/+2
| | |\ | | | | | | | | | | | | | | | | * commit '1c6ab7db30867f3eee0d550adb015b340fbbc668': Use gcc for the AAC decoder
| | * \ am 66091e46: Merge "Fix checks for {Front,Side,Back}ElementIsCpe"Chih-Hung Hsieh2014-12-012-7/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '66091e46d7aae1b45ed96f5f39274954a296db71': Fix checks for {Front,Side,Back}ElementIsCpe
| | * \ \ am 84851b23: Merge "Move back to C++98."Dan Albert2014-12-011-1/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '84851b23d6f65ce03da4fa8ef2348b4f46c0ed0f': Move back to C++98.
| | * \ \ \ am d149516e: am 7e464956: Merge "Move Clang only flags into ↵Chih-Hung Hsieh2014-10-250-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOCAL_CLANG_CPPFLAGS." * commit 'd149516e1a3a63549d2c654b1398544d5de46a3e':
| | * \ \ \ \ am 7e464956: Merge "Move Clang only flags into LOCAL_CLANG_CPPFLAGS."Chih-Hung Hsieh2014-09-231-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e46495606bd66973a10565f932acee7bddcc003': Move Clang only flags into LOCAL_CLANG_CPPFLAGS.
* | | | | | | | Update the changelog for the upcoming 0.1.4 releaseMartin Storsjo2015-03-051-0/+9
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'aosp/master'Martin Storsjo2015-03-033-9/+6
|\| | | | | | |
| * | | | | | | Merge "Do not include genericStds_linux.cpp."Chih-Hung Hsieh2015-02-182-3/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Do not include genericStds_linux.cpp.Chih-Hung Hsieh2015-02-122-3/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Merge "Use gcc for the AAC decoder"Marco Nelissen2015-02-111-0/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Use gcc for the AAC decoderMarco Nelissen2015-02-101-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clang generates crashing code for this. Change-Id: I90355d6735403290e7c0d93ff4854520b7b80f4a
| * | | | | Merge "Fix checks for {Front,Side,Back}ElementIsCpe"Chih-Hung Hsieh2014-12-012-7/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix checks for {Front,Side,Back}ElementIsCpeChih-Hung Hsieh2014-12-012-7/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | {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
| * | | | Merge "Move back to C++98."Dan Albert2014-12-011-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Move back to C++98.Dan Albert2014-11-281-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Ignore file `compile` that is generated by autogenAndrew Stone2014-11-241-0/+1
| | | |
* | | | Bump the package version number to 0.1.4Martin Storsjo2014-11-071-1/+1
| | | |
* | | | Bump the shared library major numberMartin Storsjo2014-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Include the decoder API version in the public headerMartin Storsjo2014-11-071-0/+4
| | | |
* | | | Include the new file limiter.cpp in the buildMartin Storsjo2014-11-071-0/+1
| | | |
* | | | Merge remote-tracking branch 'aosp/master'Martin Storsjo2014-11-0734-6540/+7707
|\| | |
| * | | am 7e464956: Merge "Move Clang only flags into LOCAL_CLANG_CPPFLAGS."Chih-Hung Hsieh2014-09-231-1/+1
| |\ \ \ | | |/ / | |/| / | | |/ | | | * commit '7e46495606bd66973a10565f932acee7bddcc003': Move Clang only flags into LOCAL_CLANG_CPPFLAGS.
| | * Merge "Move Clang only flags into LOCAL_CLANG_CPPFLAGS."Chih-Hung Hsieh2014-09-231-1/+1
| | |\
| | | * Move Clang only flags into LOCAL_CLANG_CPPFLAGS.Chih-Hung Hsieh2014-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Gcc does not recognize -Wno-pointer-bool-conversion. Change-Id: Ib6ffa321fff1947b6a098244f7d67fdeb45c2b41
| * | | am 4803bf75: Merge "Ignore Clang warning on checking address of arrays."Glenn Kasten2014-09-091-0/+5
| |\| | | | | | | | | | | | | | | | | | * commit '4803bf75f564e5c9304527a5b902711f78e9f621': Ignore Clang warning on checking address of arrays.
| | * | Merge "Ignore Clang warning on checking address of arrays."Glenn Kasten2014-09-091-0/+5
| | |\|
| | | * Ignore Clang warning on checking address of arrays.Chih-Hung Hsieh2014-09-031-0/+5
| | |/ | | | | | | | | | | | | BUG: 17356808 Change-Id: I464ffcfb3fc4f44ac8115f9ae98a8c46189b41cd
| * | am 2decc778: Merge "[MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6"Keun-young Park2014-08-142-2/+2
| |\| | | | | | | | | | | | | * commit '2decc77814e729df47464a504123f9b398ac7077': [MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6
| | * Merge "[MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6"Keun-young Park2014-08-142-2/+2
| | |\
| | | * [MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6Duane Sand2014-07-312-2/+2
| | |/ | | | | | | | | | Change-Id: I3dacd96cf9d5cf9c3d34d612ebb0456d64bc23bc
| * | AAC-Decoder: SBR delay for gaplessJean-Michel Trivi2014-05-206-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise decoder output delay determination. The output delay consisted of concealment and limiter delay. SBR delay was not covered but must be considered for gapless playback delay compensation. Bug 9428126 Change-Id: I67483712c284de9b5378694f9db7acbed2547dd7
| * | AAC-Decoder: DRC metadata in stream infoJean-Michel Trivi2014-05-206-7/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | Provide relevant DRC metadata information via API needed for DRC presentation mode wrapper. Bug 9428126 Change-Id: I827cd6bdfd2a8799c21935ae32af23739c90a9b6
| * | AAC Decoder: flush/seek improvementsJean-Michel Trivi2014-05-207-26/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve flushing and seeking. Add field to the API stream info structure signaling the additional output delay for flushing and delay compensation. Bug 9428126 Change-Id: I808412905563ea3de50a2e77a9b5dfee829cd2ed
| * | am 35f30c5a: Merge "AArch64: Make LONG 4 bytes"Glenn Kasten2014-04-092-5/+5
| |\| | | | | | | | | | | | | * commit '35f30c5ab8089f38681d2fdd416c00aebef5a7ff': AArch64: Make LONG 4 bytes
| | * Merge "AArch64: Make LONG 4 bytes"Glenn Kasten2014-04-092-5/+5
| | |\
| | | * AArch64: Make LONG 4 bytesMarcus Oakland2014-03-112-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libSYS/include/machine_type.h header file states LONG should be "Data type representing 4 byte signed integer on all supported platforms" but only provided for defining LONG as INT and ULONG as UINT when __x86_64__ was defined. This has been changed to when __LP64__ is defined, so that it also applies to AArch64. The change to libFDK/include/common_fix.h is then needed to get the project to compile. Change-Id: Iea42d7eca97dcc9da772a05b207d134cb999a72a Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
| * | | AAC Decoder: introduce time domain limiterJean-Michel Trivi2014-03-3111-2078/+3053
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce time domain limiter. The module is per default enabled for all AAC-LC and HE-AAC v1/2 streams. For all ER-AAC-LD and ER-AAC-ELD streams the limiter is disabled per default. The feature can be en- or disabled via dynamic API parameter. Note that the limiter introduces an additional output delay which depends on the module parameters and the streams sampling rate. Bug 9428126 Change-Id: I299a072340b33e2c324facbd347a72c8de3d380e
| * | | am 3252951f: Merge "Temporary workaround for 64-bit build error"Glenn Kasten2014-03-191-1/+1
| |\| | | | | | | | | | | | | | | | | | * commit '3252951f61e011241ce6dd8fff775fe9b9aed97f': Temporary workaround for 64-bit build error
| | * | Merge "Temporary workaround for 64-bit build error"Glenn Kasten2014-03-191-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Temporary workaround for 64-bit build errorGlenn Kasten2014-03-121-1/+1
| | |/ | | | | | | | | | | | | | | | Replace #error by #warning so we can build 64-bit Change-Id: Ib52fbfb0e5e945ff04ba51ae06b4e3393886d7b7
| * / AAC Decoder: support 6.1/7.1 decoded as 5.1Jean-Michel Trivi2013-12-3025-6539/+6522
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add 6.1 and 7.1 channel support including downmixer. Per default the decoder creates a 5.1 channel output for all streams with more than six encoded channels. Modified file(s): libPCMutils/include/pcmutils_lib.h libPCMutils/src/pcmutils_lib.cpp libAACdec/include/aacdecoder_lib.h libAACdec/src/aac_rom.h libAACdec/src/aacdecoder.cpp libAACdec/src/aac_ram.cpp libAACdec/src/aacdec_drc.cpp libAACdec/src/aacdecoder_lib.cpp libAACdec/src/aac_rom.cpp libAACdec/src/aacdecoder.h libSBRdec/include/sbrdecoder.h libSBRdec/src/sbrdec_drc.h libSBRdec/src/sbrdecoder.cpp libSBRdec/src/sbr_ram.cpp libSBRdec/src/sbr_ram.h libMpegTPDec/include/tp_data.h libMpegTPDec/include/tpdec_lib.h libMpegTPDec/src/version libMpegTPDec/src/tpdec_asc.cpp libMpegTPEnc/include/tp_data.h libMpegTPEnc/src/version libSYS/include/FDK_audio.h libSYS/src/genericStds.cpp - Fix error concealment modules fade-out/in mechanism. Modified file(s): libAACdec/src/conceal.cpp Bug 9428126 Change-Id: I3230bd2072314b730911cd7ec1740e290cb1d254
* | Include libFDK ppc headers in make distMartin Storsjo2014-11-041-0/+1
| |
* | Extend the GetInvInt table to 80 elementsMartin Storsjo2014-08-013-10/+14
| | | | | | | | | | | | | | | | | | | | 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.
* | Extend GetInvInt to support values up to 54Martin Storsjo2014-07-292-6/+7
| | | | | | | | | | | | | | | | | | 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.
* | Add support for waveformatex filesMartin Storsjo2014-06-231-1/+11
| | | | | | | | This is used for multichannel wave files.
* | Support reading sox style piped wav filesMartin Storsjo2014-06-231-1/+1
| | | | | | | | | | Sox writes the RIFF header size as a very large number, instead of as 0 as in libavformat.
* | Use skip instead of fseekMartin Storsjo2014-06-231-2/+8
| | | | | | | | | | | | | | | | 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.
* | Allow reading wav files with a 0 bytes RIFF chunkMartin Storsjo2014-06-231-1/+5
| | | | | | | | | | This is required in order to read streamed wav files produced by the libavformat wav muxer.