summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Check the right element in isBookMartin Storsjo2013-07-101-1/+1
| | | | | | | | | | This makes sure we read the right array element, corresponding to all other array accesses in the same function, and all other use of the isBook array elsewhere in the library. This makes the fix in the previous commit ("Avoid too big changes in isScale") work as intended, fixing other samples that triggered assertions.
* Avoid too big changes in isScaleMartin Storsjo2013-03-181-0/+9
| | | | | | | | | | These values are delta encoded, but only steps [-60,60] are possible to encode. If the difference between two values are bigger than that, we end up with a sequence we are unable to encode. This fixes crashes on certain stereo samples at higher bitrates.
* Merge remote-tracking branch 'aosp/master'Martin Storsjo2013-02-272-6/+0
|\
| * am 0d439d3d: Merge "Remove a bionic workaround."Elliott Hughes2012-11-290-0/+0
| |\ | | | | | | | | | | | | * commit '0d439d3d744f5ac8b0b0c16dcc9d1d3814ad002e': Remove a bionic workaround.
| | * Merge "Remove a bionic workaround."Elliott Hughes2012-11-292-6/+0
| | |\
| | | * Remove a bionic workaround.Elliott Hughes2012-11-292-6/+0
| | |/ | | | | | | | | | | | | | | | (Requires corresponding bionic patch 3975cec694a0c9b42e3f7e671fcd678da92836c3.) Change-Id: Ief968db33e2f9e1957510bbd59f25faa6828d678
| * / Remove a bionic workaround.Elliott Hughes2012-11-292-6/+0
| |/ | | | | | | | | | | | | | | (Requires corresponding bionic patch 3975cec694a0c9b42e3f7e671fcd678da92836c3.) (cherry-pick of 1d24ddc612489f57c23e78a5deaaad91f1bf6ce5.) Change-Id: I7105b17c285ff24fb48be23cf2067aef37f36d45
* | Don't try to shift more bits than the variable lengthMartin Storsjo2013-02-171-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shifting by more than (or equal to) the variable length is undefined in C. This caused the quantized spectrum values to remain unshifted, causing loud beeps in some samples. The exact same change was originally applied in 657456949 (for AOSP) and in 24021f190 (in the separate fdk-aac repo), but was overwritten and silently reverted by the new upstream code drop for Android 4.2 in 381d69840a. After the code drop, I chose not to reapply this change since the crashes that it fixed had been fixed in other ways upstream and I was unable to reproduce them after the new code drop.
* | Add a changelog entry for 0.1.1, bump the version numbersv0.1.1Martin Storsjo2012-11-132-2/+11
| |
* | Rename sbr_rom/ram files back to the original namesMartin Storsjo2012-11-023-2/+2
| | | | | | | | This minimizes the differences to upstream.
* | build: Build object files in subdirectoriesMartin Storsjo2012-11-021-0/+1
| | | | | | | | This allows producing more than one object file with the same name.
* | build: Don't use make variables in the declaration of source filesMartin Storsjo2012-11-021-131/+122
| | | | | | | | | | This is required for working dependency generation with the subdir-objects option enabled.
* | Revert "Use __builtin_clz instead of default implementation of fixnormz on GCC"Martin Storsjo2012-11-011-12/+0
| | | | | | | | | | | | | | | | | | This reverts commit e036dbc8eb7d5fdd02dc70faff20e9ac3e2989ca. Upstream took __builtin_clz in use (in the new header libFDK/include/x86/clz_x86.h, together with an alternative implementation for MSVC), so this change can be dropped to minimize the differences.
* | Revert parts of "Use saturating adds to avoid overflow"Martin Storsjo2012-11-011-2/+2
| | | | | | | | | | | | | | This reverts commit 839ae290c1f5a263613bea1a5fde863e757a8849. This change is no longer necessary on top of the new upstream, I cannot reproduce the crash that this fixed with the new upstream.
* | Only use __int64 on MSVC, not on all win32 compilersMartin Storsjo2012-11-011-1/+1
| | | | | | | | | | | | | | Mingw32 doesn't define the __int64 types. This was implicitly reverted in AOSP (where this change was already merged before) by the new code drop from Fraunhofer.
* | Update Makefile.am to account for a removed file in the latest upstreamMartin Storsjo2012-11-011-2/+1
| |
* | Merge remote-tracking branch 'aosp/jb-mr1-release' into masterMartin Storsjo2012-11-0141-4495/+4423
|\| | | | | | | | | | | | | Conflicts: libAACenc/src/band_nrg.cpp libAACenc/src/grp_data.cpp libSBRenc/src/env_est.cpp
| * Bug 7170947 Update AAC codecJean-Michel Trivi2012-10-0221-1390/+1443
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Fraunhofer: * AAC Decoder - Stick to the written MPEG standard instead of the MPEG reference software in terms of reference level normalization. Always set the program reference level equal to the target level. This disables level normalization using a default level for streams without embedded metadata. Modified file(s): libAACdec\src\aacdec_drc.cpp - Fix downmix channel assignment when using a WAV output channel ordering. Modified file(s): libPCMutils\src\pcmutils_lib.cpp - Retain signal accuracy and prevent LSB alteration when no level correction needs to be done. Modified file(s): libAACdec\src\aacdec_drc.h libAACdec\src\aacdec_drc.cpp libSBRdec\src\sbrdecoder.cpp libSBRdec\src\sbr_dec.cpp libSBRdec\src\sbrdec_drc.cpp - Align metadata processing with reference implementation. Modified file(s): libAACdec\src\aacdec_drc.h libAACdec\src\aacdecoder.cpp * AAC-Encoder - Prevent potential overflow in energy calculation after TNS processing. Modified file(s): libAACenc\src\band_nrg.cpp - Added saturation for number of relevant lines which are used in pe calculation. Modified file(s): libAACenc\src\line_pe.cpp - Removed obsolete files. Deleded file(s): libAACenc\src\tns_param.h libAACenc\src\tns_param.cpp * FDK-Library - Added x86 Count Leading Zeros intrinsic. Modified file(s): libFDK\include\clz.h Added file(s): libFDK\include\x86\clz_x86.h - Fixed compilation for MIPS GCC-4.4 and higher. Modified file(s): libFDK\include\mips\cplx_mul.h libFDK\include\mips\fixmul_mips.h Change-Id: I4be65f07f88d412224c7fddc3f054e8f451176cc
| * Merge "Don't zero out spec coeffs before doing the final IMDCT." into jb-mr1-devJohn Grossman2012-09-121-4/+1
| |\
| | * Don't zero out spec coeffs before doing the final IMDCT.John Grossman2012-09-121-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses bug 7140347. When flushing the decoder, you need to make sure to zero out any lingering spectral coefficients as well as zero out the overlap buffer state after decoding the final access unit. Zeroing out the spec coefficients *before* you decode the last block, however, seems like a mistake. If the final block contains any useful information for the stream, then you end up outputting the overlap portion of the second to last decoded block combined with zeros. Because of the shape of the second to last block's windows, this results in what appears to be a fade out, but actually is a zero'ed out final block. Signed-off-by: John Grossman <johngro@google.com> Change-Id: I0fab9ee1a5899811d5519a91dc05631e9bf4963c
| * | fix mips build by reverting files backKeun young Park2012-09-112-31/+5
| |/ | | | | | | | | | | - MIPS still needs the work-around Change-Id: If68b2028bd2779ada79020bb333ec8817abe9429
| * Bug fixes in AAC decoder, AAC encoder, FDK libraryJean-Michel Trivi2012-09-0928-4331/+4235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Latest code drop from Fraunhofer: * AAC-Decoder - Expanded AAC-LD/ELD decoder TNS max band tables to avoid wrong data access for sampling rates <22kHz and >48kHz. Modified file(s): libAACdec\src\aacdec_tns.cpp libAACdec\src\aac_rom.h libAACdec\src\aac_rom.cpp - Fixed ELD synthesis QMF filterbank scaling for downsampled SBR. Modified file(s): libFDK\src\qmf.cpp * AAC-Encoder - Fixed bit rate limiting for lower limit as introduced in the Delivery 2012-05-11. Modified file(s): libAACenc\include\aacenc_lib.h libAACenc\src\aacenc.h libAACenc\src\aacenc.cpp libSBRenc\src\sbr_rom.h libSBRenc\src\sbr_rom.cpp - Allow negative prediction gain as meaning that there is no coding gain. Make use of scaleValueSaturate in gauss window calculation. Modified file(s): libAACenc\src\aacenc_tns.cpp - Added energy saturation to prevent overflow in short blocks. Modified file(s): libAACenc\src\grp_data.cpp - Perform scalefactor adaption in case quantized lines are out of valid range. Modified file(s): libAACenc\src\quantize.cpp - Interrupt quantization loop when no spectral data is available. Adjustments in bitreservoir adaption. Modified file(s): libAACenc\src\qc_main.cpp - Indroduced dynamic scaling in none missing harmonic energy lowering compensation. Modified file(s): libSBRenc\src\env_est.cpp * FDK-Library - Fixed saturation for negative values in scaleValueSaturate. Modified file(s): libFDK\include\scale.h Change-Id: If830ea65caef6b5554281e4b7a77a8b2e08825ce
* | Make sure AACdynamic_RAM gets allocated aligned to 8 bytesJeffrey Knockel2012-10-251-1/+1
| | | | | | | | | | This fixes assert failures on platforms where malloc doesn't provide 8 byte alignment, such as Win9x.
* | Add support for Workgroup 4 (WG4) channel mappingSergio Ammirata2012-10-053-3/+18
| | | | | | | | | | This is the channel ordering used in DVD Audio, and is the standard used internally in the VLC media player.
* | Revert "Do schur_div with a direct 64 bit division instead of a loop on x86"Martin Storsjo2012-09-141-10/+0
| | | | | | | | | | | | | | | | | | This reverts commit 923f3e95f3e332d26f03cf6782f0ab61596ceef2. The optimized version differed from the original in a few cases (in some cases where the return value turned out to be negative while the original implementation returned a positive value), so revert it for now until it has been analyzed completely.
* | Add an encoder exampleMartin Storsjo2012-09-136-0/+454
| |
* | Do schur_div with a direct 64 bit division instead of a loop on x86Jakub Stachowski2012-09-091-0/+10
| | | | | | | | This speeds up HE-AACv2 encoding from 3.85 s to 3.42 s on a Core i7.
* | Merge remote-tracking branch 'aosp/master'Martin Storsjo2012-09-054-36/+5
|\|
| * Merge "Remove workaround in aac for broken toolchain"Jean-Baptiste Queru2012-09-042-5/+0
| |\
| | * Remove workaround in aac for broken toolchainIrina Tirdea2012-09-032-5/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | aac project forces the system not to include sys/types.h by defining _SYS_TYPES_H_. This is a workaround for broken android toolchain. This is no longer needed in latest android version and can be safely removed. This will also lead to more errors if changes in bionic headers are needed. Change-Id: Icb76c207d6b47e811eacff9f9403177629bfb451 Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
| * Merge "GCC 4.4 and later cannot handle h constructs. Fix to replace the ↵Jean-Baptiste Queru2012-08-152-31/+5
| |\ | | | | | | | | | assembly constructs."
| | * GCC 4.4 and later cannot handle h constructs. Fix to replace the assembly ↵Raghu Gandham2012-08-092-31/+5
| | | | | | | | | | | | | | | | | | constructs. Change-Id: I47509c20ee32f04ce42105563d2d4013910da531
| * | Merge "Don't try to shift more bits than the variable length"Jean-Baptiste Queru2012-08-131-2/+8
| |\ \ | | |/ | |/|
| | * Don't try to shift more bits than the variable lengthMartin Storsjo2012-08-101-2/+8
| |/ | | | | | | | | | | | | | | | | | | Shifting by more than (or equal to) the variable length is undefined in C. This caused the quantized spectrum values to go out of range, triggering asserts later. Change-Id: If81b6c8caa7b9c75941ad9d280b686d2069c968c
* | Use a saturating shift to avoid overflowMartin Storsjo2012-09-021-1/+1
| | | | | | | | | | When the shift overflowed, asserts were triggered later, where the values were assumed to be non-negative.
* | Use __builtin_clz instead of default implementation of fixnormz on GCCJakub Stachowski2012-08-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | The library contains architecture specific versions of the clz functions for arm and mips, but the fallback C version for other architectures is pretty slow. By using __builtin_clz on GCC (available since GCC 3.4), we get a significant (20-40 %) speedup of the total running time on x86. Speed difference: 5.1 s instead of 8.6 s for AAC-LC 128 kbit/s and 3.8 s instead of 4.9 s for HE-AACv2 32 kbit/s, on an i7.
* | Use saturating adds to avoid overflowMartin Storsjo2012-08-111-2/+2
| | | | | | | | | | When the addition overflowed, asserts were triggered later, where the values were assumed to be non-negative.
* | Use saturating adds in all other similar loops in groupShortData as wellMartin Storsjo2012-08-101-3/+3
| |
* | Don't try to shift more bits than the variable lengthMartin Storsjo2012-08-101-2/+8
| | | | | | | | | | Shifting by more than (or equal to) the variable length is undefined in C.
* | Use saturating adds to avoid overflowMartin Storsjo2012-08-102-3/+3
| | | | | | | | These additions can overflow, triggering assertions later.
* | Merge remote-tracking branch 'aosp/master'Martin Storsjo2012-08-080-0/+0
|\|
| * Merge "Only use __int64 on MSVC, not on all win32 compilers"Jean-Baptiste Queru2012-08-081-1/+1
| |\
| | * Only use __int64 on MSVC, not on all win32 compilersMartin Storsjo2012-07-121-1/+1
| |/ | | | | | | | | | | Mingw32 doesn't define the __int64 types. Change-Id: Ia45add37be1bf85abde664fd6e382334a6bb4498
| * Snapshot 2bda038c163298531d47394bc2c09e1409c5d0dbThe Android Open Source Project2012-07-11311-0/+148595
| | | | Change-Id: If584e579464f28b97d50e51fc76ba654a5536c54
* Check whether we need to link to -lm for math functionsMartin Storsjo2012-07-141-0/+2
|
* build: update libtool reference to version 2.Diego Elio Pettenò2012-07-111-4/+1
|
* build: declare the project foreign to automakeDiego Elio Pettenò2012-07-116-367/+1
| | | | | | By default automake thinks the project is part of GNU and enforces the presence of some files. By declaring the project foreign, we can remove the 0-sized files.
* build: ignore autotools support files, and remove them from the repository.Diego Elio Pettenò2012-07-1113-23093/+11
| | | | Change-Id: Icc9c9ded1142232b5030183f2a653ee7cef632b5
* build: do not use config.hDiego Elio Pettenò2012-07-112-3/+0
|
* build: use dnl for comments in configure.acDiego Elio Pettenò2012-07-111-7/+7
| | | | | This simply means the comments are not copied into the executed configure script.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 19:53:03 +0000