diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-05-12 17:41:45 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-05-12 17:41:45 +0000 |
commit | 2263cf35ab7f86ac1b4c2e6567a8164f8535d5ac (patch) | |
tree | 990f74c8a4bad875980ecbece854b9e0cfc8b76e | |
parent | 72fba7a9d77246aaf8551d915b4a2234912de6c9 (diff) | |
download | rockbox-2263cf35ab7f86ac1b4c2e6567a8164f8535d5ac.tar.gz rockbox-2263cf35ab7f86ac1b4c2e6567a8164f8535d5ac.zip |
libfaad: AAC including HE-profile needs ~470 KB for playback (measured on ARM). Therefor it does not make sense to enable HE on devices with CODEC_SIZE < 512 KB. This will allow to load and play larger AAC-LC files on such devices.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29862 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs/libfaad/common.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/codecs/libfaad/common.h b/apps/codecs/libfaad/common.h index 08f4c7ab53..fa8f4e0f39 100644 --- a/apps/codecs/libfaad/common.h +++ b/apps/codecs/libfaad/common.h | |||
@@ -78,7 +78,7 @@ extern struct codec_api* ci; | |||
78 | #endif | 78 | #endif |
79 | 79 | ||
80 | /* Used to allocate several SBR + PS arrays and variables statically. */ | 80 | /* Used to allocate several SBR + PS arrays and variables statically. */ |
81 | //#define FAAD_STATIC_ALLOC | 81 | #define FAAD_STATIC_ALLOC |
82 | 82 | ||
83 | #define INLINE __inline | 83 | #define INLINE __inline |
84 | #if 0 //defined(_WIN32) && !defined(_WIN32_WCE) | 84 | #if 0 //defined(_WIN32) && !defined(_WIN32_WCE) |
@@ -110,10 +110,8 @@ extern struct codec_api* ci; | |||
110 | 110 | ||
111 | /* Allow decoding of MAIN profile AAC */ | 111 | /* Allow decoding of MAIN profile AAC */ |
112 | #define MAIN_DEC | 112 | #define MAIN_DEC |
113 | #if MEMORYSIZE > 2 | ||
114 | /* Allow decoding of SSR profile AAC */ | 113 | /* Allow decoding of SSR profile AAC */ |
115 | #define SSR_DEC | 114 | #define SSR_DEC |
116 | #endif | ||
117 | /* Allow decoding of LTP profile AAC */ | 115 | /* Allow decoding of LTP profile AAC */ |
118 | #define LTP_DEC | 116 | #define LTP_DEC |
119 | /* Allow decoding of LD profile AAC */ | 117 | /* Allow decoding of LD profile AAC */ |
@@ -149,9 +147,9 @@ extern struct codec_api* ci; | |||
149 | #undef ERROR_RESILIENCE | 147 | #undef ERROR_RESILIENCE |
150 | #endif | 148 | #endif |
151 | 149 | ||
152 | #if MEMORYSIZE > 2 | 150 | #if CODEC_SIZE >= 0x80000 |
153 | #define SBR_DEC | 151 | #define SBR_DEC |
154 | //#define SBR_LOW_POWER | 152 | //#define SBR_LOW_POWER /* Does not work yet in rockbox. */ |
155 | #define PS_DEC | 153 | #define PS_DEC |
156 | #endif | 154 | #endif |
157 | 155 | ||