From 96d3bb449fbff0bee733fb311c23247c32a13ca1 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 18 Oct 2009 15:46:07 +0200 Subject: [PATCH] Kill unused getbit_context->size_in_bits and add some doku. --- bitstream.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/bitstream.h b/bitstream.h index f8f1b49b..07c65389 100644 --- a/bitstream.h +++ b/bitstream.h @@ -14,18 +14,16 @@ (((const uint8_t*)(x))[2] << 8) | \ ((const uint8_t*)(x))[3]) -# define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s))) +#define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s))) -/** - * Structure for bistream I/O. - * - * The buffer, buffer_end and size_in_bits fields must be present and are used - * by every reader. - */ +/** Structure for bistream I/O. */ struct getbit_context { - const uint8_t *buffer, *buffer_end; + /* Start of the internal buffer. */ + const uint8_t *buffer; + /* End of the internal buffer. */ + const uint8_t *buffer_end; + /** Bit counter. */ int index; - int size_in_bits; }; #define VLC_TYPE int16_t @@ -148,7 +146,7 @@ static inline unsigned int get_bits1(struct getbit_context *s) * \param bit_size The size of the buffer in bits. */ static inline void init_get_bits(struct getbit_context *s, - const uint8_t * buffer, int bit_size) + const uint8_t *buffer, int bit_size) { int buffer_size = (bit_size + 7) >> 3; if (buffer_size < 0 || bit_size < 0) { @@ -156,7 +154,6 @@ static inline void init_get_bits(struct getbit_context *s, buffer = NULL; } s->buffer = buffer; - s->size_in_bits = bit_size; s->buffer_end = buffer + buffer_size; s->index = 0; } -- 2.30.2