diff options
-rw-r--r-- | apps/codecs/libmad/SOURCES | 2 | ||||
-rw-r--r-- | apps/codecs/libmad/bit.c | 5 | ||||
-rw-r--r-- | apps/codecs/libmad/bit.h | 4 | ||||
-rw-r--r-- | apps/codecs/libmad/frame.c | 7 | ||||
-rw-r--r-- | apps/codecs/libmad/frame.h | 2 |
5 files changed, 15 insertions, 5 deletions
diff --git a/apps/codecs/libmad/SOURCES b/apps/codecs/libmad/SOURCES index a4ffcb5c64..b0a914fa2b 100644 --- a/apps/codecs/libmad/SOURCES +++ b/apps/codecs/libmad/SOURCES | |||
@@ -1,13 +1,11 @@ | |||
1 | bit.c | 1 | bit.c |
2 | decoder.c | 2 | decoder.c |
3 | fixed.c | ||
4 | frame.c | 3 | frame.c |
5 | huffman.c | 4 | huffman.c |
6 | layer12.c | 5 | layer12.c |
7 | layer3.c | 6 | layer3.c |
8 | stream.c | 7 | stream.c |
9 | synth.c | 8 | synth.c |
10 | timer.c | ||
11 | version.c | 9 | version.c |
12 | #if defined(CPU_COLDFIRE) | 10 | #if defined(CPU_COLDFIRE) |
13 | imdct_mcf5249.S | 11 | imdct_mcf5249.S |
diff --git a/apps/codecs/libmad/bit.c b/apps/codecs/libmad/bit.c index 660c78d9f9..c08806d385 100644 --- a/apps/codecs/libmad/bit.c +++ b/apps/codecs/libmad/bit.c | |||
@@ -106,10 +106,13 @@ unsigned int mad_bit_length(struct mad_bitptr const *begin, | |||
106 | return end->readbit - begin->readbit; | 106 | return end->readbit - begin->readbit; |
107 | } | 107 | } |
108 | 108 | ||
109 | /* rockbox: not used | ||
109 | unsigned char mad_bit_bitsleft(struct mad_bitptr const *bitptr) | 110 | unsigned char mad_bit_bitsleft(struct mad_bitptr const *bitptr) |
110 | { | 111 | { |
111 | return 8 - (bitptr->readbit & 7); | 112 | return 8 - (bitptr->readbit & 7); |
112 | } | 113 | } |
114 | */ | ||
115 | |||
113 | /* | 116 | /* |
114 | * NAME: bit->nextbyte() | 117 | * NAME: bit->nextbyte() |
115 | * DESCRIPTION: return pointer to next unprocessed byte | 118 | * DESCRIPTION: return pointer to next unprocessed byte |
@@ -152,7 +155,7 @@ uint32_t mad_bit_read(struct mad_bitptr *bitptr, unsigned int len) | |||
152 | return 0; | 155 | return 0; |
153 | } | 156 | } |
154 | 157 | ||
155 | # if 0 | 158 | # if 0 /* rockbox: not used */ |
156 | /* | 159 | /* |
157 | * NAME: bit->write() | 160 | * NAME: bit->write() |
158 | * DESCRIPTION: write an arbitrary number of bits | 161 | * DESCRIPTION: write an arbitrary number of bits |
diff --git a/apps/codecs/libmad/bit.h b/apps/codecs/libmad/bit.h index 985109f906..1c49522af5 100644 --- a/apps/codecs/libmad/bit.h +++ b/apps/codecs/libmad/bit.h | |||
@@ -34,12 +34,16 @@ void mad_bit_init(struct mad_bitptr *, unsigned char const *); | |||
34 | unsigned int mad_bit_length(struct mad_bitptr const *, | 34 | unsigned int mad_bit_length(struct mad_bitptr const *, |
35 | struct mad_bitptr const *); | 35 | struct mad_bitptr const *); |
36 | 36 | ||
37 | /* rockbox: not used | ||
37 | unsigned char mad_bit_bitsleft(struct mad_bitptr const *bitptr); | 38 | unsigned char mad_bit_bitsleft(struct mad_bitptr const *bitptr); |
39 | */ | ||
38 | unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *); | 40 | unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *); |
39 | 41 | ||
40 | void mad_bit_skip(struct mad_bitptr *, unsigned int); | 42 | void mad_bit_skip(struct mad_bitptr *, unsigned int); |
41 | uint32_t mad_bit_read(struct mad_bitptr *, unsigned int); | 43 | uint32_t mad_bit_read(struct mad_bitptr *, unsigned int); |
44 | /* rockbox: not used | ||
42 | void mad_bit_write(struct mad_bitptr *, unsigned int, uint32_t); | 45 | void mad_bit_write(struct mad_bitptr *, unsigned int, uint32_t); |
46 | */ | ||
43 | 47 | ||
44 | unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short); | 48 | unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short); |
45 | 49 | ||
diff --git a/apps/codecs/libmad/frame.c b/apps/codecs/libmad/frame.c index f5e0cf8d32..0db5c5aa44 100644 --- a/apps/codecs/libmad/frame.c +++ b/apps/codecs/libmad/frame.c | |||
@@ -79,8 +79,9 @@ void mad_header_init(struct mad_header *header) | |||
79 | 79 | ||
80 | header->flags = 0; | 80 | header->flags = 0; |
81 | header->private_bits = 0; | 81 | header->private_bits = 0; |
82 | 82 | /* rockbox: not used | |
83 | header->duration = mad_timer_zero; | 83 | header->duration = mad_timer_zero; |
84 | */ | ||
84 | } | 85 | } |
85 | 86 | ||
86 | /* | 87 | /* |
@@ -374,9 +375,11 @@ int mad_header_decode(struct mad_header *header, struct mad_stream *stream) | |||
374 | goto fail; | 375 | goto fail; |
375 | 376 | ||
376 | /* calculate frame duration */ | 377 | /* calculate frame duration */ |
378 | /* rockbox: not used | ||
377 | mad_timer_set(&header->duration, 0, | 379 | mad_timer_set(&header->duration, 0, |
378 | 32 * MAD_NSBSAMPLES(header), header->samplerate); | 380 | 32 * MAD_NSBSAMPLES(header), header->samplerate); |
379 | 381 | */ | |
382 | |||
380 | /* calculate free bit rate */ | 383 | /* calculate free bit rate */ |
381 | if (header->bitrate == 0) { | 384 | if (header->bitrate == 0) { |
382 | if ((stream->freerate == 0 || !stream->sync || | 385 | if ((stream->freerate == 0 || !stream->sync || |
diff --git a/apps/codecs/libmad/frame.h b/apps/codecs/libmad/frame.h index 2693b0b38b..f96a310089 100644 --- a/apps/codecs/libmad/frame.h +++ b/apps/codecs/libmad/frame.h | |||
@@ -61,7 +61,9 @@ struct mad_header { | |||
61 | int flags; /* flags (see below) */ | 61 | int flags; /* flags (see below) */ |
62 | int private_bits; /* private bits (see below) */ | 62 | int private_bits; /* private bits (see below) */ |
63 | 63 | ||
64 | #if 0 /* rockbox: not used */ | ||
64 | mad_timer_t duration; /* audio playing time of frame */ | 65 | mad_timer_t duration; /* audio playing time of frame */ |
66 | #endif | ||
65 | }; | 67 | }; |
66 | 68 | ||
67 | struct mad_frame { | 69 | struct mad_frame { |