diff options
Diffstat (limited to 'liba52/bitstream.c')
| -rw-r--r-- | liba52/bitstream.c | 53 |
1 files changed, 23 insertions, 30 deletions
diff --git a/liba52/bitstream.c b/liba52/bitstream.c index 3a25001c57..6c275109d1 100644 --- a/liba52/bitstream.c +++ b/liba52/bitstream.c @@ -1,6 +1,6 @@ /* * bitstream.c - * Copyright (C) 2000-2001 Michel Lespinasse <walken@zoy.org> + * Copyright (C) 2000-2002 Michel Lespinasse <walken@zoy.org> * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> * * This file is part of a52dec, a free ATSC A-52 stream decoder. @@ -37,34 +37,27 @@ #ifdef ALT_BITSTREAM_READER int indx=0; -uint32_t * buffer_start; -#else -static uint32_t * buffer_start; #endif -uint32_t bits_left; -uint32_t current_word; - -void bitstream_set_ptr (uint8_t * buf) +void a52_bitstream_set_ptr (a52_state_t * state, uint8_t * buf) { int align; - align = (int)buf & 3; - buffer_start = (uint32_t *) (buf - align); - bits_left = 0; + align = (long)buf & 3; + state->buffer_start = (uint32_t *) (buf - align); + state->bits_left = 0; #ifdef ALT_BITSTREAM_READER indx=0; #endif - bitstream_get (align * 8); + bitstream_get (state, align * 8); } -static inline void -bitstream_fill_current(void) +static inline void bitstream_fill_current (a52_state_t * state) { uint32_t tmp; - tmp = *(buffer_start++); - current_word = swab32 (tmp); + tmp = *(state->buffer_start++); + state->current_word = swab32 (tmp); } /* @@ -76,38 +69,38 @@ bitstream_fill_current(void) * -ah */ -uint32_t -bitstream_get_bh(uint32_t num_bits) +uint32_t a52_bitstream_get_bh (a52_state_t * state, uint32_t num_bits) { uint32_t result; - num_bits -= bits_left; - result = (current_word << (32 - bits_left)) >> (32 - bits_left); + num_bits -= state->bits_left; + result = ((state->current_word << (32 - state->bits_left)) >> + (32 - state->bits_left)); - bitstream_fill_current(); + bitstream_fill_current (state); if(num_bits != 0) - result = (result << num_bits) | (current_word >> (32 - num_bits)); + result = (result << num_bits) | (state->current_word >> (32 - num_bits)); - bits_left = 32 - num_bits; + state->bits_left = 32 - num_bits; return result; } -int32_t -bitstream_get_bh_2(uint32_t num_bits) +int32_t a52_bitstream_get_bh_2 (a52_state_t * state, uint32_t num_bits) { int32_t result; - num_bits -= bits_left; - result = (((int32_t)current_word) << (32 - bits_left)) >> (32 - bits_left); + num_bits -= state->bits_left; + result = ((((int32_t)state->current_word) << (32 - state->bits_left)) >> + (32 - state->bits_left)); - bitstream_fill_current(); + bitstream_fill_current(state); if(num_bits != 0) - result = (result << num_bits) | (current_word >> (32 - num_bits)); + result = (result << num_bits) | (state->current_word >> (32 - num_bits)); - bits_left = 32 - num_bits; + state->bits_left = 32 - num_bits; return result; } |