Mercurial > libavcodec.hg
changeset 3633:f9660d3a9975 libavcodec
2nd try of skip_bits_long() for the ALT reader
1st try for the LIBMPEG2 reader
simplify init_get_bits()
| author | michael |
|---|---|
| date | Sat, 26 Aug 2006 11:50:23 +0000 |
| parents | 25ceb2cc950d |
| children | fa4beebb74a6 |
| files | bitstream.h |
| diffstat | 1 files changed, 14 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/bitstream.h Sat Aug 26 11:37:33 2006 +0000 +++ b/bitstream.h Sat Aug 26 11:50:23 2006 +0000 @@ -446,7 +446,7 @@ } static inline void skip_bits_long(GetBitContext *s, int n){ - s->index + n; + s->index += n; } #elif defined LIBMPEG2_BITSTREAM_READER @@ -512,6 +512,16 @@ return (s->buffer_ptr - s->buffer)*8 - 16 + s->bit_count; } +static inline void skip_bits_long(GetBitContext *s, int n){ + OPEN_READER(re, s) + re_bit_count += n; + re_buffer_ptr += 2*(re_bit_count>>4); + re_bit_count &= 15; + re_cache = ((re_buffer_ptr[-2]<<8) + re_buffer_ptr[-1]) << (16+re_bit_count); + UPDATE_CACHE(re, s) + CLOSE_READER(re, s) +} + #elif defined A32_BITSTREAM_READER # define MIN_CACHE_BITS 32 @@ -706,25 +716,9 @@ #ifdef ALT_BITSTREAM_READER s->index=0; #elif defined LIBMPEG2_BITSTREAM_READER -#ifdef LIBMPEG2_BITSTREAM_READER_HACK - if ((int)buffer&1) { - /* word alignment */ - s->cache = (*buffer++)<<24; - s->buffer_ptr = buffer; - s->bit_count = 16-8; - } else -#endif - { - s->buffer_ptr = buffer; - s->bit_count = 16; - s->cache = 0; - } - { - OPEN_READER(re, s) - UPDATE_CACHE(re, s) - UPDATE_CACHE(re, s) - CLOSE_READER(re, s) - } + s->buffer_ptr = (uint8_t*)((intptr_t)buffer&(~1)); + s->bit_count = 16 + 8*((intptr_t)buffer&1); + skip_bits_long(s, 0); #elif defined A32_BITSTREAM_READER s->buffer_ptr = (uint32_t*)((intptr_t)buffer&(~3)); s->bit_count = 32 + 8*((intptr_t)buffer&3);