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 /apps/codecs | |
| parent | 281666a066357ae2b69306239717743241be615a (diff) | |
| download | rockbox-fffc6c4a801ac5203b3a45599f55ce6c9662066e.zip rockbox-fffc6c4a801ac5203b3a45599f55ce6c9662066e.tar.gz rockbox-fffc6c4a801ac5203b3a45599f55ce6c9662066e.tar.bz2 rockbox-fffc6c4a801ac5203b3a45599f55ce6c9662066e.tar.xz | |
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
Diffstat (limited to 'apps/codecs')
| -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 e5b86ba..720042b 100644 --- a/apps/codecs/libfaad/common.h +++ b/apps/codecs/libfaad/common.h @@ -71,6 +71,7 @@ extern struct codec_api* ci; #define ICODE_ATTR_FAAD_LARGE_IRAM ICODE_ATTR #define ICONST_ATTR_FAAD_LARGE_IRAM ICONST_ATTR #define IBSS_ATTR_FAAD_XLR IBSS_ATTR +#define HAVE_FAAD_XLR_IN_IRAM #else /* Not enough IRAM available. */ diff --git a/apps/codecs/libfaad/sbr_dec.c b/apps/codecs/libfaad/sbr_dec.c index 4904c70..21e8e02 100644 --- a/apps/codecs/libfaad/sbr_dec.c +++ b/apps/codecs/libfaad/sbr_dec.c @@ -57,7 +57,7 @@ typedef struct { /* static variables */ static XLR_t *p_XLR = NULL; -#if defined(FAAD_STATIC_ALLOC) || defined(IBSS_ATTR_FAAD_XLR) +#if defined(FAAD_STATIC_ALLOC) || defined(HAVE_FAAD_XLR_IN_IRAM) static XLR_t s_XLR IBSS_ATTR_FAAD_XLR MEM_ALIGN_ATTR; #endif #if defined(FAAD_STATIC_ALLOC) @@ -102,7 +102,7 @@ sbr_info *sbrDecodeInit(uint16_t framelength, uint8_t id_aac, uint8_t id_ele, /* Allocate XLR temporary variable. Use static allocation if either * FAAD_STATIC_ALLOC is set or XLR fits to IRAM. */ -#if defined(FAAD_STATIC_ALLOC) || defined(IBSS_ATTR_FAAD_XLR) +#if defined(FAAD_STATIC_ALLOC) || defined(HAVE_FAAD_XLR_IN_IRAM) p_XLR = &s_XLR; #else p_XLR = (XLR_t*)faad_malloc(sizeof(XLR_t)); |