diff options
author | Michael Giacomelli <giac2000@hotmail.com> | 2009-04-25 03:51:58 +0000 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2009-04-25 03:51:58 +0000 |
commit | f5884fdeb6252c77973d0f08ee952bb981f6678c (patch) | |
tree | cea52389f31d0554fae974119268088ac4b29104 /apps/codecs | |
parent | 87b231c68ce71d247e87ab528b96b05d314357ce (diff) | |
download | rockbox-f5884fdeb6252c77973d0f08ee952bb981f6678c.tar.gz rockbox-f5884fdeb6252c77973d0f08ee952bb981f6678c.zip |
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.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20781 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/SOURCES | 3 | ||||
-rw-r--r-- | apps/codecs/libfaad/common.h | 4 | ||||
-rw-r--r-- | apps/codecs/libfaad/specrec.c | 2 | ||||
-rw-r--r-- | apps/codecs/libfaad/syntax.c | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/apps/codecs/SOURCES b/apps/codecs/SOURCES index 670dc2e2e6..5dc7f31c56 100644 --- a/apps/codecs/SOURCES +++ b/apps/codecs/SOURCES | |||
@@ -15,8 +15,9 @@ sid.c | |||
15 | ape.c | 15 | ape.c |
16 | nsf.c | 16 | nsf.c |
17 | asap.c | 17 | asap.c |
18 | #if MEMORYSIZE > 2 | ||
19 | aac.c | 18 | aac.c |
19 | |||
20 | #if MEMORYSIZE > 2 | ||
20 | spc.c | 21 | spc.c |
21 | #endif | 22 | #endif |
22 | mod.c | 23 | mod.c |
diff --git a/apps/codecs/libfaad/common.h b/apps/codecs/libfaad/common.h index a9c67a5459..ea028b1b8e 100644 --- a/apps/codecs/libfaad/common.h +++ b/apps/codecs/libfaad/common.h | |||
@@ -86,8 +86,10 @@ extern struct codec_api* ci; | |||
86 | 86 | ||
87 | /* Allow decoding of MAIN profile AAC */ | 87 | /* Allow decoding of MAIN profile AAC */ |
88 | #define MAIN_DEC | 88 | #define MAIN_DEC |
89 | #if MEMORYSIZE > 2 | ||
89 | /* Allow decoding of SSR profile AAC */ | 90 | /* Allow decoding of SSR profile AAC */ |
90 | #define SSR_DEC | 91 | #define SSR_DEC |
92 | #endif | ||
91 | /* Allow decoding of LTP profile AAC */ | 93 | /* Allow decoding of LTP profile AAC */ |
92 | #define LTP_DEC | 94 | #define LTP_DEC |
93 | /* Allow decoding of LD profile AAC */ | 95 | /* Allow decoding of LD profile AAC */ |
@@ -123,9 +125,11 @@ extern struct codec_api* ci; | |||
123 | #undef ERROR_RESILIENCE | 125 | #undef ERROR_RESILIENCE |
124 | #endif | 126 | #endif |
125 | 127 | ||
128 | #if MEMORYSIZE > 2 | ||
126 | #define SBR_DEC | 129 | #define SBR_DEC |
127 | //#define SBR_LOW_POWER | 130 | //#define SBR_LOW_POWER |
128 | #define PS_DEC | 131 | #define PS_DEC |
132 | #endif | ||
129 | 133 | ||
130 | /* FIXED POINT: No MAIN decoding */ | 134 | /* FIXED POINT: No MAIN decoding */ |
131 | #ifdef FIXED_POINT | 135 | #ifdef FIXED_POINT |
diff --git a/apps/codecs/libfaad/specrec.c b/apps/codecs/libfaad/specrec.c index 87470f54f4..de57c4b7ce 100644 --- a/apps/codecs/libfaad/specrec.c +++ b/apps/codecs/libfaad/specrec.c | |||
@@ -719,6 +719,8 @@ static uint8_t allocate_single_channel(NeAACDecHandle hDecoder, uint8_t channel, | |||
719 | memset(hDecoder->time_out[channel+1], 0, mul*hDecoder->frameLength*sizeof(real_t)); | 719 | memset(hDecoder->time_out[channel+1], 0, mul*hDecoder->frameLength*sizeof(real_t)); |
720 | } | 720 | } |
721 | } | 721 | } |
722 | #else | ||
723 | (void)output_channels; /*silence warning when PS disabled*/ | ||
722 | #endif | 724 | #endif |
723 | 725 | ||
724 | if (hDecoder->fb_intermed[channel] == NULL) | 726 | if (hDecoder->fb_intermed[channel] == NULL) |
diff --git a/apps/codecs/libfaad/syntax.c b/apps/codecs/libfaad/syntax.c index 9476029932..fa077d4e94 100644 --- a/apps/codecs/libfaad/syntax.c +++ b/apps/codecs/libfaad/syntax.c | |||
@@ -1058,6 +1058,8 @@ static uint8_t fill_element(NeAACDecHandle hDecoder, bitfile *ld, drc_info *drc | |||
1058 | } | 1058 | } |
1059 | #endif | 1059 | #endif |
1060 | } else { | 1060 | } else { |
1061 | #else | ||
1062 | (void)hDecoder; | ||
1061 | #endif | 1063 | #endif |
1062 | while (count > 0) | 1064 | while (count > 0) |
1063 | { | 1065 | { |