Mercurial > libavcodec.hg
changeset 2614:5e24800ab329 libavcodec
various fixes related to the non alt_bitstream_reader
| author | michael |
|---|---|
| date | Mon, 18 Apr 2005 12:08:16 +0000 |
| parents | 1c1b53f353ff |
| children | 0d88e3f89379 |
| files | bitstream.h dv.c svq3.c |
| diffstat | 3 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/bitstream.h Mon Apr 18 11:24:20 2005 +0000 +++ b/bitstream.h Mon Apr 18 12:08:16 2005 +0000 @@ -429,7 +429,7 @@ # define UPDATE_CACHE(name, gb)\ if(name##_bit_count >= 0){\ name##_cache+= (int)be2me_16(*(uint16_t*)name##_buffer_ptr) << name##_bit_count;\ - ((uint16_t*)name##_buffer_ptr)++;\ + name##_buffer_ptr += 2;\ name##_bit_count-= 16;\ }\
--- a/dv.c Mon Apr 18 11:24:20 2005 +0000 +++ b/dv.c Mon Apr 18 12:08:16 2005 +0000 @@ -263,6 +263,7 @@ #ifndef ALT_BITSTREAM_READER #warning only works with ALT_BITSTREAM_READER +static int re_index; //Hack to make it compile #endif static inline int get_bits_left(GetBitContext *s)
--- a/svq3.c Mon Apr 18 11:24:20 2005 +0000 +++ b/svq3.c Mon Apr 18 12:08:16 2005 +0000 @@ -720,7 +720,7 @@ } else { int length = (header >> 5) & 3; - h->next_slice_index = s->gb.index + 8*show_bits (&s->gb, 8*length) + 8*length; + h->next_slice_index = get_bits_count(&s->gb) + 8*show_bits (&s->gb, 8*length) + 8*length; if (h->next_slice_index > s->gb.size_in_bits){ av_log(h->s.avctx, AV_LOG_ERROR, "slice after bitstream end\n"); @@ -728,10 +728,10 @@ } s->gb.size_in_bits = h->next_slice_index - 8*(length - 1); - s->gb.index += 8; + skip_bits(&s->gb, 8); if (length > 0) { - memcpy ((uint8_t *) &s->gb.buffer[s->gb.index >> 3], + memcpy ((uint8_t *) &s->gb.buffer[get_bits_count(&s->gb) >> 3], &s->gb.buffer[s->gb.size_in_bits >> 3], (length - 1)); } } @@ -939,10 +939,10 @@ for (s->mb_y=0; s->mb_y < s->mb_height; s->mb_y++) { for (s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { - if ( (s->gb.index + 7) >= s->gb.size_in_bits && - ((s->gb.index & 7) == 0 || show_bits (&s->gb, (-s->gb.index & 7)) == 0)) { + if ( (get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits && + ((get_bits_count(&s->gb) & 7) == 0 || show_bits (&s->gb, (-get_bits_count(&s->gb) & 7)) == 0)) { - s->gb.index = h->next_slice_index; + skip_bits(&s->gb, h->next_slice_index - get_bits_count(&s->gb)); s->gb.size_in_bits = 8*buf_size; if (svq3_decode_slice_header (h))