devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Trapped into ifdef-hell. Configure libfaad's IRAM/DRAM usage like it is meant to be.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29864 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2011-05-12 22:24:09 +00:00
parent 281666a066
commit fffc6c4a80
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
apps/codecs/libfaad/common.h
View file

@ -71,6 +71,7 @@ extern struct codec_api* ci;
#define ICODE_ATTR_FAAD_LARGE_IRAM ICODE_ATTR #define ICODE_ATTR_FAAD_LARGE_IRAM ICODE_ATTR
#define ICONST_ATTR_FAAD_LARGE_IRAM ICONST_ATTR #define ICONST_ATTR_FAAD_LARGE_IRAM ICONST_ATTR
#define IBSS_ATTR_FAAD_XLR IBSS_ATTR #define IBSS_ATTR_FAAD_XLR IBSS_ATTR
#define HAVE_FAAD_XLR_IN_IRAM
#else #else
/* Not enough IRAM available. */ /* Not enough IRAM available. */

4
apps/codecs/libfaad/sbr_dec.c
View file

@ -57,7 +57,7 @@ typedef struct {
/* static variables */ /* static variables */
static XLR_t *p_XLR = NULL; 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; static XLR_t s_XLR IBSS_ATTR_FAAD_XLR MEM_ALIGN_ATTR;
#endif #endif
#if defined(FAAD_STATIC_ALLOC) #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 /* Allocate XLR temporary variable. Use static allocation if either
* FAAD_STATIC_ALLOC is set or XLR fits to IRAM. */ * 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; p_XLR = &s_XLR;
#else #else
p_XLR = (XLR_t*)faad_malloc(sizeof(XLR_t)); p_XLR = (XLR_t*)faad_malloc(sizeof(XLR_t));