diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-05-12 22:24:09 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-05-12 22:24:09 +0000 |
commit | fffc6c4a801ac5203b3a45599f55ce6c9662066e (patch) | |
tree | 8b682f76553ac9603fb2a3022ad9bb8d24d23011 | |
parent | 281666a066357ae2b69306239717743241be615a (diff) | |
download | rockbox-fffc6c4a801ac5203b3a45599f55ce6c9662066e.tar.gz rockbox-fffc6c4a801ac5203b3a45599f55ce6c9662066e.zip |
Trapped into ifdef-hell. Configure libfaad's IRAM/DRAM usage like it is meant to be.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29864 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs/libfaad/common.h | 1 | ||||
-rw-r--r-- | apps/codecs/libfaad/sbr_dec.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/codecs/libfaad/common.h b/apps/codecs/libfaad/common.h index e5b86ba978..720042b4aa 100644 --- a/apps/codecs/libfaad/common.h +++ b/apps/codecs/libfaad/common.h | |||
@@ -71,6 +71,7 @@ extern struct codec_api* ci; | |||
71 | #define ICODE_ATTR_FAAD_LARGE_IRAM ICODE_ATTR | 71 | #define ICODE_ATTR_FAAD_LARGE_IRAM ICODE_ATTR |
72 | #define ICONST_ATTR_FAAD_LARGE_IRAM ICONST_ATTR | 72 | #define ICONST_ATTR_FAAD_LARGE_IRAM ICONST_ATTR |
73 | #define IBSS_ATTR_FAAD_XLR IBSS_ATTR | 73 | #define IBSS_ATTR_FAAD_XLR IBSS_ATTR |
74 | #define HAVE_FAAD_XLR_IN_IRAM | ||
74 | 75 | ||
75 | #else | 76 | #else |
76 | /* Not enough IRAM available. */ | 77 | /* Not enough IRAM available. */ |
diff --git a/apps/codecs/libfaad/sbr_dec.c b/apps/codecs/libfaad/sbr_dec.c index 4904c702ee..21e8e028a1 100644 --- a/apps/codecs/libfaad/sbr_dec.c +++ b/apps/codecs/libfaad/sbr_dec.c | |||
@@ -57,7 +57,7 @@ typedef struct { | |||
57 | 57 | ||
58 | /* static variables */ | 58 | /* static variables */ |
59 | static XLR_t *p_XLR = NULL; | 59 | static XLR_t *p_XLR = NULL; |
60 | #if defined(FAAD_STATIC_ALLOC) || defined(IBSS_ATTR_FAAD_XLR) | 60 | #if defined(FAAD_STATIC_ALLOC) || defined(HAVE_FAAD_XLR_IN_IRAM) |
61 | static XLR_t s_XLR IBSS_ATTR_FAAD_XLR MEM_ALIGN_ATTR; | 61 | static XLR_t s_XLR IBSS_ATTR_FAAD_XLR MEM_ALIGN_ATTR; |
62 | #endif | 62 | #endif |
63 | #if defined(FAAD_STATIC_ALLOC) | 63 | #if defined(FAAD_STATIC_ALLOC) |
@@ -102,7 +102,7 @@ sbr_info *sbrDecodeInit(uint16_t framelength, uint8_t id_aac, uint8_t id_ele, | |||
102 | 102 | ||
103 | /* Allocate XLR temporary variable. Use static allocation if either | 103 | /* Allocate XLR temporary variable. Use static allocation if either |
104 | * FAAD_STATIC_ALLOC is set or XLR fits to IRAM. */ | 104 | * FAAD_STATIC_ALLOC is set or XLR fits to IRAM. */ |
105 | #if defined(FAAD_STATIC_ALLOC) || defined(IBSS_ATTR_FAAD_XLR) | 105 | #if defined(FAAD_STATIC_ALLOC) || defined(HAVE_FAAD_XLR_IN_IRAM) |
106 | p_XLR = &s_XLR; | 106 | p_XLR = &s_XLR; |
107 | #else | 107 | #else |
108 | p_XLR = (XLR_t*)faad_malloc(sizeof(XLR_t)); | 108 | p_XLR = (XLR_t*)faad_malloc(sizeof(XLR_t)); |