Kill the bits_wrap and bits_size parameters of init_vlc().

[paraslash.git] / bitstream.h

diff --git a/bitstream.h b/bitstream.h
index 0a701d7c8636229f98b37f49dd16603a8b132a1b..7e518c5f78a2cff976929e158585b75207f1d985 100644 (file)
--- 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.
  *
@@ -190,8 +162,7 @@ static inline void init_get_bits(struct getbit_context *s,
 }
 
 int init_vlc(struct vlc *vlc, int nb_bits, int nb_codes,
-       const void *bits, int bits_wrap, int bits_size,
-       const void *codes, int codes_wrap, int codes_size);
+       const void *bits, const void *codes, int codes_wrap, int codes_size);
 
 void free_vlc(struct vlc *vlc);