diff options
-rw-r--r-- | apps/codecs/libffmpegFLAC/bitstream.h | 6 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/coldfire.S | 2 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/decoder.c | 12 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/decoder.h | 2 |
4 files changed, 16 insertions, 6 deletions
diff --git a/apps/codecs/libffmpegFLAC/bitstream.h b/apps/codecs/libffmpegFLAC/bitstream.h index 62e98c07ea..668e23a836 100644 --- a/apps/codecs/libffmpegFLAC/bitstream.h +++ b/apps/codecs/libffmpegFLAC/bitstream.h | |||
@@ -252,7 +252,7 @@ static inline unsigned int get_bits(GetBitContext *s, int n){ | |||
252 | return tmp; | 252 | return tmp; |
253 | } | 253 | } |
254 | 254 | ||
255 | unsigned int get_bits_long(GetBitContext *s, int n); | 255 | unsigned int get_bits_long(GetBitContext *s, int n) ICODE_ATTR; |
256 | 256 | ||
257 | /** | 257 | /** |
258 | * shows 0-17 bits. | 258 | * shows 0-17 bits. |
@@ -267,7 +267,7 @@ static inline unsigned int show_bits(GetBitContext *s, int n){ | |||
267 | return tmp; | 267 | return tmp; |
268 | } | 268 | } |
269 | 269 | ||
270 | unsigned int show_bits_long(GetBitContext *s, int n); | 270 | unsigned int show_bits_long(GetBitContext *s, int n) ICODE_ATTR; |
271 | 271 | ||
272 | static inline void skip_bits(GetBitContext *s, int n){ | 272 | static inline void skip_bits(GetBitContext *s, int n){ |
273 | //Note gcc seems to optimize this to s->index+=n for the ALT_READER :)) | 273 | //Note gcc seems to optimize this to s->index+=n for the ALT_READER :)) |
@@ -328,6 +328,6 @@ static inline void init_get_bits(GetBitContext *s, | |||
328 | } | 328 | } |
329 | } | 329 | } |
330 | 330 | ||
331 | void align_get_bits(GetBitContext *s); | 331 | void align_get_bits(GetBitContext *s) ICODE_ATTR; |
332 | 332 | ||
333 | #endif /* BITSTREAM_H */ | 333 | #endif /* BITSTREAM_H */ |
diff --git a/apps/codecs/libffmpegFLAC/coldfire.S b/apps/codecs/libffmpegFLAC/coldfire.S index 720e6edd86..33964cdbc1 100644 --- a/apps/codecs/libffmpegFLAC/coldfire.S +++ b/apps/codecs/libffmpegFLAC/coldfire.S | |||
@@ -23,7 +23,7 @@ | |||
23 | All LPC filtering up to order 8 is done in specially optimised unrolled | 23 | All LPC filtering up to order 8 is done in specially optimised unrolled |
24 | loops, while every order above this is handled by a slower default routine. | 24 | loops, while every order above this is handled by a slower default routine. |
25 | */ | 25 | */ |
26 | .text | 26 | .section .icode,"ax",@progbits |
27 | .global lpc_decode_emac | 27 | .global lpc_decode_emac |
28 | .align 2 | 28 | .align 2 |
29 | lpc_decode_emac: | 29 | lpc_decode_emac: |
diff --git a/apps/codecs/libffmpegFLAC/decoder.c b/apps/codecs/libffmpegFLAC/decoder.c index 351db1b5a5..9d84bb17e4 100644 --- a/apps/codecs/libffmpegFLAC/decoder.c +++ b/apps/codecs/libffmpegFLAC/decoder.c | |||
@@ -111,6 +111,7 @@ static const uint8_t table_crc8[256] ICONST_ATTR = { | |||
111 | 0xe6, 0xe1, 0xe8, 0xef, 0xfa, 0xfd, 0xf4, 0xf3 | 111 | 0xe6, 0xe1, 0xe8, 0xef, 0xfa, 0xfd, 0xf4, 0xf3 |
112 | }; | 112 | }; |
113 | 113 | ||
114 | static int64_t get_utf8(GetBitContext *gb) ICODE_ATTR; | ||
114 | static int64_t get_utf8(GetBitContext *gb) | 115 | static int64_t get_utf8(GetBitContext *gb) |
115 | { | 116 | { |
116 | uint64_t val; | 117 | uint64_t val; |
@@ -135,7 +136,9 @@ static int64_t get_utf8(GetBitContext *gb) | |||
135 | return val; | 136 | return val; |
136 | } | 137 | } |
137 | 138 | ||
138 | static int get_crc8(const uint8_t *buf, int count){ | 139 | static int get_crc8(const uint8_t *buf, int count) ICODE_ATTR; |
140 | static int get_crc8(const uint8_t *buf, int count) | ||
141 | { | ||
139 | int crc=0; | 142 | int crc=0; |
140 | int i; | 143 | int i; |
141 | 144 | ||
@@ -146,6 +149,7 @@ static int get_crc8(const uint8_t *buf, int count){ | |||
146 | return crc; | 149 | return crc; |
147 | } | 150 | } |
148 | 151 | ||
152 | static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order) ICODE_ATTR; | ||
149 | static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order) | 153 | static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order) |
150 | { | 154 | { |
151 | int i, tmp, partition, method_type, rice_order; | 155 | int i, tmp, partition, method_type, rice_order; |
@@ -185,6 +189,7 @@ static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order) | |||
185 | return 0; | 189 | return 0; |
186 | } | 190 | } |
187 | 191 | ||
192 | static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_order) ICODE_ATTR; | ||
188 | static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_order) | 193 | static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_order) |
189 | { | 194 | { |
190 | int i; | 195 | int i; |
@@ -231,6 +236,7 @@ static int decode_subframe_fixed(FLACContext *s, int32_t* decoded, int pred_orde | |||
231 | return 0; | 236 | return 0; |
232 | } | 237 | } |
233 | 238 | ||
239 | static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) ICODE_ATTR; | ||
234 | static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) | 240 | static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) |
235 | { | 241 | { |
236 | int sum, i, j; | 242 | int sum, i, j; |
@@ -380,6 +386,10 @@ static inline int decode_subframe(FLACContext *s, int channel, int32_t* decoded) | |||
380 | static int decode_frame(FLACContext *s, | 386 | static int decode_frame(FLACContext *s, |
381 | int32_t* decoded0, | 387 | int32_t* decoded0, |
382 | int32_t* decoded1, | 388 | int32_t* decoded1, |
389 | void (*yield)(void)) ICODE_ATTR; | ||
390 | static int decode_frame(FLACContext *s, | ||
391 | int32_t* decoded0, | ||
392 | int32_t* decoded1, | ||
383 | void (*yield)(void)) | 393 | void (*yield)(void)) |
384 | { | 394 | { |
385 | int blocksize_code, sample_rate_code, sample_size_code, assignment, crc8; | 395 | int blocksize_code, sample_rate_code, sample_size_code, assignment, crc8; |
diff --git a/apps/codecs/libffmpegFLAC/decoder.h b/apps/codecs/libffmpegFLAC/decoder.h index 5d503adc78..9e2240fea3 100644 --- a/apps/codecs/libffmpegFLAC/decoder.h +++ b/apps/codecs/libffmpegFLAC/decoder.h | |||
@@ -41,6 +41,6 @@ int flac_decode_frame(FLACContext *s, | |||
41 | int32_t* decoded0, | 41 | int32_t* decoded0, |
42 | int32_t* decoded1, | 42 | int32_t* decoded1, |
43 | uint8_t *buf, int buf_size, | 43 | uint8_t *buf, int buf_size, |
44 | void (*yield)(void)); | 44 | void (*yield)(void)) ICODE_ATTR; |
45 | 45 | ||
46 | #endif | 46 | #endif |