From d1e59cd9694f425d6e03c5e002abafc712d59334 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 18 Oct 2009 12:33:05 +0200 Subject: [PATCH] Remove some cruft from bitstream.h. --- bitstream.h | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/bitstream.h b/bitstream.h index 0a701d7c..71d78fcd 100644 --- a/bitstream.h +++ b/bitstream.h @@ -14,7 +14,6 @@ (((const uint8_t*)(x))[2] << 8) | \ ((const uint8_t*)(x))[3]) -# define NEG_SSR32(a,s) ((( int32_t)(a))>>(32-(s))) # define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s))) /** @@ -37,8 +36,6 @@ struct vlc { int table_size, table_allocated; }; -#define MIN_CACHE_BITS 25 - /** Load \a gb into local variables. */ #define OPEN_READER(name, gb)\ int name##_index= (gb)->index;\ @@ -50,8 +47,6 @@ struct vlc { /** * Refill the internal cache from the bitstream. - * - * After this call at least MIN_CACHE_BITS will be available. */ #define UPDATE_CACHE(name, gb)\ name##_cache= AV_RB32( ((const uint8_t *)(gb)->buffer) \ @@ -96,14 +91,8 @@ static inline int get_bits_count(struct getbit_context *s) return s->index; } -static inline void skip_bits_long(struct getbit_context *s, int n) -{ - s->index += n; -} - /** - * reads 1-17 bits. - * Note, the alt bitstream reader can read up to 25 bits, but the libmpeg2 reader can't + * Read 1-17 bits. */ static inline unsigned int get_bits(struct getbit_context *s, int n) { @@ -118,9 +107,6 @@ static inline unsigned int get_bits(struct getbit_context *s, int n) /** * Show 1-17 bits. - * - * Note, the alt bitstream reader can read up to 25 bits, but the libmpeg2 - * reader can't. */ static inline unsigned int show_bits(struct getbit_context *s, int n) { @@ -128,7 +114,6 @@ static inline unsigned int show_bits(struct getbit_context *s, int n) OPEN_READER(re, s) UPDATE_CACHE(re, s) tmp = SHOW_UBITS(re, s, n); -// CLOSE_READER(re, s) return tmp; } @@ -153,19 +138,6 @@ static inline unsigned int get_bits1(struct getbit_context *s) return result; } -/** - * reads 0-32 bits. - */ -static inline unsigned int get_bits_long(struct getbit_context *s, int n) -{ - if (n <= 17) - return get_bits(s, n); - else { - int ret = get_bits(s, 16) << (n - 16); - return ret | get_bits(s, n - 16); - } -} - /** * Initialize a getbit_context structure. * -- 2.30.2