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

faad: move inline function in header

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27683 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-08-03 17:59:59 +00:00
parent 40e3b09678
commit 29b2a049de
2 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

21
apps/codecs/libfaad/bits.c
View file

@ -110,27 +110,6 @@ uint8_t faad_byte_align(bitfile *ld)
return 0; return 0;
} }
void faad_flushbits_ex(bitfile *ld, uint32_t bits)
{
uint32_t tmp;
ld->bufa = ld->bufb;
if (ld->no_more_reading == 0)
{
tmp = getdword(ld->tail);
ld->tail++;
} else {
tmp = 0;
}
ld->bufb = tmp;
ld->bits_left += (32 - bits);
ld->bytes_used += 4;
if (ld->bytes_used == ld->buffer_size)
ld->no_more_reading = 1;
if (ld->bytes_used > ld->buffer_size)
ld->error = 1;
}
/* rewind to beginning */ /* rewind to beginning */
void faad_rewindbits(bitfile *ld) void faad_rewindbits(bitfile *ld)
{ {

22
apps/codecs/libfaad/bits.h
View file

@ -77,7 +77,6 @@ void faad_initbits_rev(bitfile *ld, void *buffer,
uint32_t bits_in_buffer); uint32_t bits_in_buffer);
uint8_t faad_byte_align(bitfile *ld); uint8_t faad_byte_align(bitfile *ld);
uint32_t faad_get_processed_bits(bitfile *ld); uint32_t faad_get_processed_bits(bitfile *ld);
INLINE void faad_flushbits_ex(bitfile *ld, uint32_t bits);
void faad_rewindbits(bitfile *ld); void faad_rewindbits(bitfile *ld);
uint8_t *faad_getbitbuffer(bitfile *ld, uint32_t bits uint8_t *faad_getbitbuffer(bitfile *ld, uint32_t bits
DEBUGDEC); DEBUGDEC);
@ -95,6 +94,27 @@ static INLINE uint32_t getdword(void *mem)
#endif #endif
} }
static INLINE void faad_flushbits_ex(bitfile *ld, uint32_t bits)
{
uint32_t tmp;
ld->bufa = ld->bufb;
if (ld->no_more_reading == 0)
{
tmp = getdword(ld->tail);
ld->tail++;
} else {
tmp = 0;
}
ld->bufb = tmp;
ld->bits_left += (32 - bits);
ld->bytes_used += 4;
if (ld->bytes_used == ld->buffer_size)
ld->no_more_reading = 1;
if (ld->bytes_used > ld->buffer_size)
ld->error = 1;
}
static INLINE uint32_t faad_showbits(bitfile *ld, uint32_t bits) static INLINE uint32_t faad_showbits(bitfile *ld, uint32_t bits)
{ {
if (bits <= ld->bits_left) if (bits <= ld->bits_left)