mirror of
https://github.com/cookiengineer/audacity
synced 2026-01-19 23:36:08 +01:00
Update twolame to 0.3.13.
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
* $Id: bitbuffer.c,v 1.3 2008-02-01 19:44:27 richardash1981 Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -33,82 +33,31 @@
|
||||
|
||||
|
||||
/*create bit buffer*/
|
||||
bit_stream* buffer_init( unsigned char *buffer, int buffer_size )
|
||||
bit_stream *buffer_init(unsigned char *buffer, int buffer_size)
|
||||
{
|
||||
bit_stream* bs = (bit_stream *)TWOLAME_MALLOC( sizeof(bit_stream) );
|
||||
|
||||
bs->buf = buffer;
|
||||
bs->buf_size = buffer_size;
|
||||
bs->buf_byte_idx = 0;
|
||||
bs->buf_bit_idx = 8;
|
||||
bs->totbit = 0;
|
||||
bs->eob = FALSE;
|
||||
bs->eobs = FALSE;
|
||||
|
||||
return bs;
|
||||
bit_stream *bs = (bit_stream *) TWOLAME_MALLOC(sizeof(bit_stream));
|
||||
|
||||
bs->buf = buffer;
|
||||
bs->buf_size = buffer_size;
|
||||
bs->buf_byte_idx = 0;
|
||||
bs->buf_bit_idx = 8;
|
||||
bs->totbit = 0;
|
||||
bs->eob = FALSE;
|
||||
bs->eobs = FALSE;
|
||||
|
||||
return bs;
|
||||
}
|
||||
|
||||
/* Dellocate bit buffer */
|
||||
void buffer_deinit( bit_stream **bs )
|
||||
void buffer_deinit(bit_stream ** bs)
|
||||
{
|
||||
|
||||
if (bs==NULL||*bs==NULL) return;
|
||||
if (bs == NULL || *bs == NULL)
|
||||
return;
|
||||
|
||||
TWOLAME_FREE( *bs );
|
||||
TWOLAME_FREE(*bs);
|
||||
}
|
||||
|
||||
|
||||
/*write 1 bit from the bit stream */
|
||||
void buffer_put1bit (bit_stream * bs, int bit)
|
||||
{
|
||||
bs->totbit++;
|
||||
|
||||
bs->buf[bs->buf_byte_idx] |= (bit & 0x1) << (bs->buf_bit_idx - 1);
|
||||
bs->buf_bit_idx--;
|
||||
if (!bs->buf_bit_idx) {
|
||||
bs->buf_bit_idx = 8;
|
||||
bs->buf_byte_idx++;
|
||||
if (bs->buf_byte_idx >= bs->buf_size) {
|
||||
//empty_buffer (bs, minimum);
|
||||
fprintf(stdout,"buffer_put1bit: error. bit_stream buffer needs to be bigger\n");
|
||||
exit(99);
|
||||
}
|
||||
bs->buf[bs->buf_byte_idx] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
/*write N bits into the bit stream */
|
||||
void buffer_putbits (bit_stream * bs, unsigned int val, int N)
|
||||
{
|
||||
static const int putmask[9] = { 0x0, 0x1, 0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f, 0xff };
|
||||
register int j = N;
|
||||
register int k, tmp;
|
||||
|
||||
bs->totbit += N;
|
||||
while (j > 0) {
|
||||
k = MIN (j, bs->buf_bit_idx);
|
||||
tmp = val >> (j - k);
|
||||
bs->buf[bs->buf_byte_idx] |= (tmp & putmask[k]) << (bs->buf_bit_idx - k);
|
||||
bs->buf_bit_idx -= k;
|
||||
if (!bs->buf_bit_idx) {
|
||||
bs->buf_bit_idx = 8;
|
||||
bs->buf_byte_idx++;
|
||||
if (bs->buf_byte_idx >= bs->buf_size) {
|
||||
//empty_buffer (bs, minimum);
|
||||
fprintf(stdout,"buffer_putbits: error. bit_stream buffer needs to be bigger\n");
|
||||
exit(99);
|
||||
}
|
||||
bs->buf[bs->buf_byte_idx] = 0;
|
||||
}
|
||||
j -= k;
|
||||
}
|
||||
}
|
||||
|
||||
/*return the current bit stream length (in bits)*/
|
||||
unsigned long buffer_sstell (bit_stream * bs)
|
||||
{
|
||||
return (bs->totbit);
|
||||
}
|
||||
|
||||
|
||||
// vim:ts=4:sw=4:nowrap:
|
||||
|
||||
Reference in New Issue
Block a user