diff options
author | Tomasz Malesinski <tomal@rockbox.org> | 2006-11-09 21:59:27 +0000 |
---|---|---|
committer | Tomasz Malesinski <tomal@rockbox.org> | 2006-11-09 21:59:27 +0000 |
commit | 5c54ba49d5c05e394a31f3827f7c4a75e28d9999 (patch) | |
tree | 096c978d3e4d259cc6cf08ee5ccdd4414d06c013 /apps/codecs/libffmpegFLAC | |
parent | 2e383a430de025378bf17942a1cf5ea86860f700 (diff) | |
download | rockbox-5c54ba49d5c05e394a31f3827f7c4a75e28d9999.tar.gz rockbox-5c54ba49d5c05e394a31f3827f7c4a75e28d9999.zip |
Added macros controlling what goes to IRAM on different targets.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11483 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libffmpegFLAC')
-rw-r--r-- | apps/codecs/libffmpegFLAC/bitstream.h | 14 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/decoder.c | 12 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/decoder.h | 2 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/shndec.c | 2 |
4 files changed, 19 insertions, 11 deletions
diff --git a/apps/codecs/libffmpegFLAC/bitstream.h b/apps/codecs/libffmpegFLAC/bitstream.h index 288d839c4a..19f2b6e01c 100644 --- a/apps/codecs/libffmpegFLAC/bitstream.h +++ b/apps/codecs/libffmpegFLAC/bitstream.h | |||
@@ -18,6 +18,14 @@ | |||
18 | #define ICODE_ATTR | 18 | #define ICODE_ATTR |
19 | #endif | 19 | #endif |
20 | 20 | ||
21 | #ifndef ICODE_ATTR_FLAC | ||
22 | #define ICODE_ATTR_FLAC ICODE_ATTR | ||
23 | #endif | ||
24 | |||
25 | #ifndef IBSS_ATTR_FLAC_DECODED0 | ||
26 | #define IBSS_ATTR_FLAC_DECODED0 IBSS_ATTR | ||
27 | #endif | ||
28 | |||
21 | /* Endian conversion routines for standalone compilation */ | 29 | /* Endian conversion routines for standalone compilation */ |
22 | #ifdef BUILD_STANDALONE | 30 | #ifdef BUILD_STANDALONE |
23 | #ifdef BUILD_BIGENDIAN | 31 | #ifdef BUILD_BIGENDIAN |
@@ -252,7 +260,7 @@ static inline unsigned int get_bits(GetBitContext *s, int n){ | |||
252 | return tmp; | 260 | return tmp; |
253 | } | 261 | } |
254 | 262 | ||
255 | unsigned int get_bits_long(GetBitContext *s, int n) ICODE_ATTR; | 263 | unsigned int get_bits_long(GetBitContext *s, int n) ICODE_ATTR_FLAC; |
256 | 264 | ||
257 | /** | 265 | /** |
258 | * shows 0-17 bits. | 266 | * shows 0-17 bits. |
@@ -267,7 +275,7 @@ static inline unsigned int show_bits(GetBitContext *s, int n){ | |||
267 | return tmp; | 275 | return tmp; |
268 | } | 276 | } |
269 | 277 | ||
270 | unsigned int show_bits_long(GetBitContext *s, int n) ICODE_ATTR; | 278 | unsigned int show_bits_long(GetBitContext *s, int n) ICODE_ATTR_FLAC; |
271 | 279 | ||
272 | static inline void skip_bits(GetBitContext *s, int n){ | 280 | static inline void skip_bits(GetBitContext *s, int n){ |
273 | //Note gcc seems to optimize this to s->index+=n for the ALT_READER :)) | 281 | //Note gcc seems to optimize this to s->index+=n for the ALT_READER :)) |
@@ -328,6 +336,6 @@ static inline void init_get_bits(GetBitContext *s, | |||
328 | } | 336 | } |
329 | } | 337 | } |
330 | 338 | ||
331 | void align_get_bits(GetBitContext *s) ICODE_ATTR; | 339 | void align_get_bits(GetBitContext *s) ICODE_ATTR_FLAC; |
332 | 340 | ||
333 | #endif /* BITSTREAM_H */ | 341 | #endif /* BITSTREAM_H */ |
diff --git a/apps/codecs/libffmpegFLAC/decoder.c b/apps/codecs/libffmpegFLAC/decoder.c index 3d934d9990..8a1f84c6b6 100644 --- a/apps/codecs/libffmpegFLAC/decoder.c +++ b/apps/codecs/libffmpegFLAC/decoder.c | |||
@@ -99,7 +99,7 @@ static const uint8_t table_crc8[256] ICONST_ATTR = { | |||
99 | 0xe6, 0xe1, 0xe8, 0xef, 0xfa, 0xfd, 0xf4, 0xf3 | 99 | 0xe6, 0xe1, 0xe8, 0xef, 0xfa, 0xfd, 0xf4, 0xf3 |
100 | }; | 100 | }; |
101 | 101 | ||
102 | static int64_t get_utf8(GetBitContext *gb) ICODE_ATTR; | 102 | static int64_t get_utf8(GetBitContext *gb) ICODE_ATTR_FLAC; |
103 | static int64_t get_utf8(GetBitContext *gb) | 103 | static int64_t get_utf8(GetBitContext *gb) |
104 | { | 104 | { |
105 | uint64_t val; | 105 | uint64_t val; |
@@ -124,7 +124,7 @@ static int64_t get_utf8(GetBitContext *gb) | |||
124 | return val; | 124 | return val; |
125 | } | 125 | } |
126 | 126 | ||
127 | static int get_crc8(const uint8_t *buf, int count) ICODE_ATTR; | 127 | static int get_crc8(const uint8_t *buf, int count) ICODE_ATTR_FLAC; |
128 | static int get_crc8(const uint8_t *buf, int count) | 128 | static int get_crc8(const uint8_t *buf, int count) |
129 | { | 129 | { |
130 | int crc=0; | 130 | int crc=0; |
@@ -137,7 +137,7 @@ static int get_crc8(const uint8_t *buf, int count) | |||
137 | return crc; | 137 | return crc; |
138 | } | 138 | } |
139 | 139 | ||
140 | static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order) ICODE_ATTR; | 140 | static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order) ICODE_ATTR_FLAC; |
141 | static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order) | 141 | static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order) |
142 | { | 142 | { |
143 | int i, tmp, partition, method_type, rice_order; | 143 | int i, tmp, partition, method_type, rice_order; |
@@ -177,7 +177,7 @@ static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order) | |||
177 | return 0; | 177 | return 0; |
178 | } | 178 | } |
179 | 179 | ||
180 | static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_order) ICODE_ATTR; | 180 | static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_order) ICODE_ATTR_FLAC; |
181 | static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_order) | 181 | static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_order) |
182 | { | 182 | { |
183 | int i; | 183 | int i; |
@@ -224,7 +224,7 @@ static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_orde | |||
224 | return 0; | 224 | return 0; |
225 | } | 225 | } |
226 | 226 | ||
227 | static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) ICODE_ATTR; | 227 | static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) ICODE_ATTR_FLAC; |
228 | static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) | 228 | static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) |
229 | { | 229 | { |
230 | int sum, i, j; | 230 | int sum, i, j; |
@@ -386,7 +386,7 @@ static inline int decode_subframe(FLACContext *s, int channel, int32_t* decoded) | |||
386 | static int decode_frame(FLACContext *s, | 386 | static int decode_frame(FLACContext *s, |
387 | int32_t* decoded0, | 387 | int32_t* decoded0, |
388 | int32_t* decoded1, | 388 | int32_t* decoded1, |
389 | void (*yield)(void)) ICODE_ATTR; | 389 | void (*yield)(void)) ICODE_ATTR_FLAC; |
390 | static int decode_frame(FLACContext *s, | 390 | static int decode_frame(FLACContext *s, |
391 | int32_t* decoded0, | 391 | int32_t* decoded0, |
392 | int32_t* decoded1, | 392 | int32_t* decoded1, |
diff --git a/apps/codecs/libffmpegFLAC/decoder.h b/apps/codecs/libffmpegFLAC/decoder.h index affec0a5a3..0b148df916 100644 --- a/apps/codecs/libffmpegFLAC/decoder.h +++ b/apps/codecs/libffmpegFLAC/decoder.h | |||
@@ -44,6 +44,6 @@ int flac_decode_frame(FLACContext *s, | |||
44 | int32_t* decoded0, | 44 | int32_t* decoded0, |
45 | int32_t* decoded1, | 45 | int32_t* decoded1, |
46 | uint8_t *buf, int buf_size, | 46 | uint8_t *buf, int buf_size, |
47 | void (*yield)(void)) ICODE_ATTR; | 47 | void (*yield)(void)) ICODE_ATTR_FLAC; |
48 | 48 | ||
49 | #endif | 49 | #endif |
diff --git a/apps/codecs/libffmpegFLAC/shndec.c b/apps/codecs/libffmpegFLAC/shndec.c index d7fc6a15a6..61b3703188 100644 --- a/apps/codecs/libffmpegFLAC/shndec.c +++ b/apps/codecs/libffmpegFLAC/shndec.c | |||
@@ -83,7 +83,7 @@ static unsigned int get_uint(ShortenContext *s, int k) | |||
83 | } | 83 | } |
84 | 84 | ||
85 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 85 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) |
86 | static void coldfire_lshift_samples(int n, int shift, int32_t *samples) ICODE_ATTR; | 86 | static void coldfire_lshift_samples(int n, int shift, int32_t *samples) ICODE_ATTR_FLAC; |
87 | static void coldfire_lshift_samples(int n, int shift, int32_t *samples) | 87 | static void coldfire_lshift_samples(int n, int shift, int32_t *samples) |
88 | { | 88 | { |
89 | /* | 89 | /* |