diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-04-24 20:19:05 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-04-24 20:19:05 +0000 |
commit | a602f46d69d9d18756b7f317470f654f695faa80 (patch) | |
tree | f111cc29197def94d5404d15c7febfd06efed9f7 /apps/codecs/libfaad/common.c | |
parent | 69580a96eb816d9b811c542d38181126243d8563 (diff) | |
download | rockbox-a602f46d69d9d18756b7f317470f654f695faa80.tar.gz rockbox-a602f46d69d9d18756b7f317470f654f695faa80.zip |
Rework of libfaad in several areas. Allow removal of malloc with a new define FAAD_STATIC_ALLOC (in common.h). For now malloc is not fully removed but used by a few arrays needed for AAC-HE SBR+PS only. Reason to keep malloc is to have this amount of memory available for AAC-LC files which might require large m4a tables. The changes make the allocation routines much smaller, better centralized and allow to move duplicated code from aac.c/raa.c to libfaad. The rework includes removal of (now and former) unused code as well.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29778 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libfaad/common.c')
-rw-r--r-- | apps/codecs/libfaad/common.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/apps/codecs/libfaad/common.c b/apps/codecs/libfaad/common.c index a8b32d7d00..bedf56a212 100644 --- a/apps/codecs/libfaad/common.c +++ b/apps/codecs/libfaad/common.c | |||
@@ -169,25 +169,6 @@ int8_t can_decode_ot(const uint8_t object_type) | |||
169 | return -1; | 169 | return -1; |
170 | } | 170 | } |
171 | 171 | ||
172 | void *faad_malloc(size_t size) | ||
173 | { | ||
174 | #if 0 // defined(_WIN32) && !defined(_WIN32_WCE) | ||
175 | return _aligned_malloc(size, 16); | ||
176 | #else // #ifdef 0 | ||
177 | return malloc(size); | ||
178 | #endif // #ifdef 0 | ||
179 | } | ||
180 | |||
181 | /* common free function */ | ||
182 | void faad_free(void *b) | ||
183 | { | ||
184 | #if 0 // defined(_WIN32) && !defined(_WIN32_WCE) | ||
185 | _aligned_free(b); | ||
186 | #else | ||
187 | free(b); | ||
188 | } | ||
189 | #endif | ||
190 | |||
191 | static const uint8_t Parity [256] = { // parity | 172 | static const uint8_t Parity [256] = { // parity |
192 | 0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1, | 173 | 0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1, |
193 | 1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0, | 174 | 1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0, |