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

86 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
7147e71a75 Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 
am: 6318d60241

* commit '6318d6024194f89d809f4e22266105f27389f41b':
  Fix aacDecoder_drcExtractAndMap()

Change-Id: I1a836bd8b024948f18b2d2c0e912601722f887bc
 2016-04-19 01:00:01 +00:00
Jean-Michel Trivi
6318d60241 Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 
am: 0a20959871

* commit '0a209598713cccc4f10e9c0036df487bea5af312':
  Fix aacDecoder_drcExtractAndMap()

Change-Id: If2339aad0e0e825302773f2f04f0dd43cc754ac6
 2016-04-19 00:57:44 +00:00
Jean-Michel Trivi
0a20959871 Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 
am: 78653b30e9

* commit '78653b30e9c1907d4c6eefa30ff954e0c4398447':
  Fix aacDecoder_drcExtractAndMap()

Change-Id: I53cabb3bab17e8754a03648ffac356e4a3a05e28
 2016-04-19 00:55:30 +00:00
Jean-Michel Trivi
78653b30e9 Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f 
am: 1a54e8f638

* commit '1a54e8f6385f9cbb8d950f0ff003bb71daa62caf':
  Fix aacDecoder_drcExtractAndMap()

Change-Id: I3c992ce7d3a60685f75a944d8d588fb9ff0d050c
 2016-04-19 00:53:17 +00:00
Jean-Michel Trivi
1a54e8f638 Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 
am: b762ff3e4f

* commit 'b762ff3e4fdc29ce517824e19d187ba667e80623':
  Fix aacDecoder_drcExtractAndMap()

Change-Id: I29eaf51574e1834f223a9755a353abd90fcf912b
 2016-04-19 00:50:57 +00:00
Jean-Michel Trivi
b762ff3e4f Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d 
am: be3ff35425

* commit 'be3ff35425f026fb3714f1bd45c40aee6737fe05':
  Fix aacDecoder_drcExtractAndMap()

Change-Id: I82060408eab9a8990c511af4c6be8a588d2a1b49
 2016-04-19 00:48:42 +00:00
Jean-Michel Trivi
be3ff35425 Fix aacDecoder_drcExtractAndMap() 
am: 97a1b8140d

* commit '97a1b8140d410ed3942006aa22b40ccb322f747b':
  Fix aacDecoder_drcExtractAndMap()

Change-Id: I1bf523e635139d71ef124462bd61e0da06191d35
 2016-04-19 00:46:26 +00:00
Jean-Michel Trivi
97a1b8140d Fix aacDecoder_drcExtractAndMap() 
Parse DVB DRC data only when numThreads is below
 MAX_DRC_THREADS. The post-increment is necessary as
 it is used in fill element DRC data section.
This solution parses as many DRC payloads as allowed by
 MAX_DRC_THREADS and skips all remaining DRC elements in the stream.

Bug 27792766
Bug 26751339

Change-Id: Ie1641888bac1757c4d1491119f977fc5d436eaea
 2016-04-15 08:14:50 -07:00
Jean-Michel Trivi
118fc75eee Fix stack corruption happening in aacDecoder_drcExtractAndMap() am: a06d1c2 
am: 47739cd

* commit '47739cd9d8d7842436b90ef14207c935b0a799fe':
  Fix stack corruption happening in aacDecoder_drcExtractAndMap()
 2016-03-22 02:44:32 +00:00
Jean-Michel Trivi
47739cd9d8 Fix stack corruption happening in aacDecoder_drcExtractAndMap() 
am: a06d1c2

* commit 'a06d1c2b9af1621037b48557aac42b5ecbdb03b3':
  Fix stack corruption happening in aacDecoder_drcExtractAndMap()
 2016-03-22 02:36:16 +00:00
Jean-Michel Trivi
a06d1c2b9a Fix stack corruption happening in aacDecoder_drcExtractAndMap() 
In the aacDecoder_drcExtractAndMap() function, self->numThreads
  can be used after having exceeded its intended max value,
  MAX_DRC_THREADS, causing memory to be cleared after the
  threadBs[MAX_DRC_THREADS] array.
The crash is prevented by never using self->numThreads with
  a value equal to or greater than MAX_DRC_THREADS.
A proper fix will be required as there seems to be an issue as
  to which entry in the threadBs array is meant to be initialized
  and used.

Bug 26751339

Change-Id: I655cc40c35d4206ab72e83b2bdb751be2fe52b5a
 2016-03-21 21:59:22 +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
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
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
Duane Sand
5c51a5898e [MIPSR6] Skip assembler code using MFHI/MFLO on mips32r6 
Change-Id: I3dacd96cf9d5cf9c3d34d612ebb0456d64bc23bc
 2014-07-31 15:40:38 -07:00
Jean-Michel Trivi
6792cf6361 AAC-Decoder: SBR delay for gapless 
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
 2014-05-20 17:39:03 -07:00
Jean-Michel Trivi
8e087bf394 AAC-Decoder: DRC metadata in stream info 
Provide relevant DRC metadata information via API needed for DRC
  presentation mode wrapper.

Bug 9428126

Change-Id: I827cd6bdfd2a8799c21935ae32af23739c90a9b6
 2014-05-20 17:29:03 -07:00
Jean-Michel Trivi
af967fcc55 AAC Decoder: flush/seek improvements 
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
 2014-05-20 17:24:06 -07:00
Glenn Kasten
fb2e845179 am 35f30c5a: Merge "AArch64: Make LONG 4 bytes" 
* commit '35f30c5ab8089f38681d2fdd416c00aebef5a7ff':
  AArch64: Make LONG 4 bytes
 2014-04-09 15:57:48 +00:00
Glenn Kasten
35f30c5ab8 Merge "AArch64: Make LONG 4 bytes" 2014-04-09 15:49:10 +00:00
Jean-Michel Trivi
603f48ab99 AAC Decoder: introduce time domain limiter 
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
 2014-03-31 23:41:44 +00:00
Glenn Kasten
629f60c0e7 am 3252951f: Merge "Temporary workaround for 64-bit build error" 
* commit '3252951f61e011241ce6dd8fff775fe9b9aed97f':
  Temporary workaround for 64-bit build error
 2014-03-19 21:13:03 +00:00
Glenn Kasten
3252951f61 Merge "Temporary workaround for 64-bit build error" 2014-03-19 20:58:18 +00:00
Glenn Kasten
8609bfea36 Temporary workaround for 64-bit build error 
Replace #error by #warning so we can build 64-bit

Change-Id: Ib52fbfb0e5e945ff04ba51ae06b4e3393886d7b7
 2014-03-12 11:19:32 -07:00
Marcus Oakland
f2f96fb86d AArch64: Make LONG 4 bytes 
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>
 2014-03-11 12:01:00 +00:00
Jean-Michel Trivi
47c680c622 AAC Decoder: support 6.1/7.1 decoded as 5.1 
- 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
 2013-12-30 09:40:08 -08:00
Jean-Michel Trivi
fa3eba1644 Encoder 7.1 support 
* AAC-Encoder

   - Add 7.1 rear surround and 7.1 front center support to supported encoder
     channel modes. Change max channels from 6 to 8 and add 7.1 configuration
     to bandwidth and channel mapping functions.
     Modified file(s):
        libAACenc\include\aacenc_lib.h
        libAACenc\src\aacEnc_ram.cpp
        libAACenc\src\aacEnc_ram.h
        libAACenc\src\aacenc.cpp
        libAACenc\src\aacenc.h
        libAACenc\src\aacenc_lib.cpp
        libAACenc\src\adj_thr.cpp
        libAACenc\src\adj_thr.h
        libAACenc\src\adj_thr_data.h
        libAACenc\src\bandwidth.cpp
        libAACenc\src\bitenc.cpp
        libAACenc\src\channel_map.cpp
        libAACenc\src\interface.h
        libAACenc\src\metadata_compressor.cpp
        libAACenc\src\psy_main.cpp
        libAACenc\src\psy_main.h
        libAACenc\src\qc_data.h
        libAACenc\src\qc_main.cpp
        libAACenc\src\qc_main.h

* SBR-Encoder

   - Support up to 7.1 audio channels. Changed max channels from 6 to 8.
     Modified file(s):
        libSBRenc\include\sbr_encoder.h
        libSBRenc\src\sbr.h
        libSBRenc\src\sbr_encoder.cpp
        libSBRenc\src\sbr_ram.cpp

* Transport-Encoder
   - Add 7.1 channel configuration to audio specific config writer in
     transport encoder library.
     Modified file(s):
        libMpegTPEnc\src\tpenc_asc.cpp
        libMpegTPEnc\src\version

* SYS-Library
   - Add 7.1 channel modes to CHANNEL_MODE description.
     Modified file(s):
        libSYS\include\FDK_audio.h
        libSYS\src\genericStds.cpp

Bug 9428126

Change-Id: Ide53583aa8e03df4537b98db80740dfe0e7a9e0f
 2013-09-03 14:19:38 -07:00