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

Disable AAC-SBR, AAC-SSR, and AAC-PS on Sansa clip. Clean up warnings introduced by this. Enable compiling the AAC codec on the Clip. Due to lack of memory for seek tables, files over 10 minutes long or so will probably fail.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20781 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Giacomelli 2009-04-25 03:51:58 +00:00
parent 87b231c68c
commit f5884fdeb6
4 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/codecs/SOURCES
View file

@ -15,8 +15,9 @@ sid.c
ape.c ape.c
nsf.c nsf.c
asap.c asap.c
#if MEMORYSIZE > 2
aac.c aac.c
#if MEMORYSIZE > 2
spc.c spc.c
#endif #endif
mod.c mod.c

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

@ -86,8 +86,10 @@ extern struct codec_api* ci;
/* Allow decoding of MAIN profile AAC */ /* Allow decoding of MAIN profile AAC */
#define MAIN_DEC #define MAIN_DEC
#if MEMORYSIZE > 2
/* Allow decoding of SSR profile AAC */ /* Allow decoding of SSR profile AAC */
#define SSR_DEC #define SSR_DEC
#endif
/* Allow decoding of LTP profile AAC */ /* Allow decoding of LTP profile AAC */
#define LTP_DEC #define LTP_DEC
/* Allow decoding of LD profile AAC */ /* Allow decoding of LD profile AAC */
@ -123,9 +125,11 @@ extern struct codec_api* ci;
#undef ERROR_RESILIENCE #undef ERROR_RESILIENCE
#endif #endif
#if MEMORYSIZE > 2
#define SBR_DEC #define SBR_DEC
//#define SBR_LOW_POWER //#define SBR_LOW_POWER
#define PS_DEC #define PS_DEC
#endif
/* FIXED POINT: No MAIN decoding */ /* FIXED POINT: No MAIN decoding */
#ifdef FIXED_POINT #ifdef FIXED_POINT

2
apps/codecs/libfaad/specrec.c
View file

@ -719,6 +719,8 @@ static uint8_t allocate_single_channel(NeAACDecHandle hDecoder, uint8_t channel,
memset(hDecoder->time_out[channel+1], 0, mul*hDecoder->frameLength*sizeof(real_t)); memset(hDecoder->time_out[channel+1], 0, mul*hDecoder->frameLength*sizeof(real_t));
} }
} }
#else
(void)output_channels; /*silence warning when PS disabled*/
#endif #endif
if (hDecoder->fb_intermed[channel] == NULL) if (hDecoder->fb_intermed[channel] == NULL)

2
apps/codecs/libfaad/syntax.c
View file

@ -1058,6 +1058,8 @@ static uint8_t fill_element(NeAACDecHandle hDecoder, bitfile *ld, drc_info *drc
} }
#endif #endif
} else { } else {
#else
(void)hDecoder;
#endif #endif
while (count > 0) while (count > 0)
{ {