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

Comment further unused code in libmad.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27160 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2010-06-27 18:59:54 +00:00
parent 4c026f0c7f
commit c6ced1c466
5 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/codecs/libmad/SOURCES
View file

@ -1,13 +1,11 @@
bit.c bit.c
decoder.c decoder.c
fixed.c
frame.c frame.c
huffman.c huffman.c
layer12.c layer12.c
layer3.c layer3.c
stream.c stream.c
synth.c synth.c
timer.c
version.c version.c
#if defined(CPU_COLDFIRE) #if defined(CPU_COLDFIRE)
imdct_mcf5249.S imdct_mcf5249.S

5
apps/codecs/libmad/bit.c
View file

@ -106,10 +106,13 @@ unsigned int mad_bit_length(struct mad_bitptr const *begin,
return end->readbit - begin->readbit; return end->readbit - begin->readbit;
} }
/* rockbox: not used
unsigned char mad_bit_bitsleft(struct mad_bitptr const *bitptr) unsigned char mad_bit_bitsleft(struct mad_bitptr const *bitptr)
{ {
return 8 - (bitptr->readbit & 7); return 8 - (bitptr->readbit & 7);
} }
*/
/* /*
* NAME: bit->nextbyte() * NAME: bit->nextbyte()
* DESCRIPTION: return pointer to next unprocessed byte * DESCRIPTION: return pointer to next unprocessed byte
@ -152,7 +155,7 @@ uint32_t mad_bit_read(struct mad_bitptr *bitptr, unsigned int len)
return 0; return 0;
} }
# if 0 # if 0 /* rockbox: not used */
/* /*
* NAME: bit->write() * NAME: bit->write()
* DESCRIPTION: write an arbitrary number of bits * DESCRIPTION: write an arbitrary number of bits

4
apps/codecs/libmad/bit.h
View file

@ -34,12 +34,16 @@ void mad_bit_init(struct mad_bitptr *, unsigned char const *);
unsigned int mad_bit_length(struct mad_bitptr const *, unsigned int mad_bit_length(struct mad_bitptr const *,
struct mad_bitptr const *); struct mad_bitptr const *);
/* rockbox: not used
unsigned char mad_bit_bitsleft(struct mad_bitptr const *bitptr); unsigned char mad_bit_bitsleft(struct mad_bitptr const *bitptr);
*/
unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *); unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *);
void mad_bit_skip(struct mad_bitptr *, unsigned int); void mad_bit_skip(struct mad_bitptr *, unsigned int);
uint32_t mad_bit_read(struct mad_bitptr *, unsigned int); uint32_t mad_bit_read(struct mad_bitptr *, unsigned int);
/* rockbox: not used
void mad_bit_write(struct mad_bitptr *, unsigned int, uint32_t); void mad_bit_write(struct mad_bitptr *, unsigned int, uint32_t);
*/
unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short); unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);

7
apps/codecs/libmad/frame.c
View file

@ -79,8 +79,9 @@ void mad_header_init(struct mad_header *header)
header->flags = 0; header->flags = 0;
header->private_bits = 0; header->private_bits = 0;
/* rockbox: not used
header->duration = mad_timer_zero; header->duration = mad_timer_zero;
*/
} }
/* /*
@ -374,9 +375,11 @@ int mad_header_decode(struct mad_header *header, struct mad_stream *stream)
goto fail; goto fail;
/* calculate frame duration */ /* calculate frame duration */
/* rockbox: not used
mad_timer_set(&header->duration, 0, mad_timer_set(&header->duration, 0,
32 * MAD_NSBSAMPLES(header), header->samplerate); 32 * MAD_NSBSAMPLES(header), header->samplerate);
*/
/* calculate free bit rate */ /* calculate free bit rate */
if (header->bitrate == 0) { if (header->bitrate == 0) {
if ((stream->freerate == 0 || !stream->sync || if ((stream->freerate == 0 || !stream->sync ||

2
apps/codecs/libmad/frame.h
View file

@ -61,7 +61,9 @@ struct mad_header {
int flags; /* flags (see below) */ int flags; /* flags (see below) */
int private_bits; /* private bits (see below) */ int private_bits; /* private bits (see below) */
#if 0 /* rockbox: not used */
mad_timer_t duration; /* audio playing time of frame */ mad_timer_t duration; /* audio playing time of frame */
#endif
}; };
struct mad_frame { struct mad_frame {