X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=bitstream.h;h=7f944dbf3b79f57088f8ef180cf6d0d7efa76617;hp=7e518c5f78a2cff976929e158585b75207f1d985;hb=3138b08cfc53ea698c5d2d12d000586392abdc75;hpb=a4ae014c7b47509d236ddc7a63a3510079470382

diff --git a/bitstream.h b/bitstream.h
index 7e518c5f..7f944dbf 100644
--- a/bitstream.h
+++ b/bitstream.h
@@ -14,18 +14,14 @@
                      (((const uint8_t*)(x))[2] <<  8) | \
                       ((const uint8_t*)(x))[3])
 
-# 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
@@ -36,94 +32,28 @@ struct vlc {
 	int table_size, table_allocated;
 };
 
-/** Load \a gb into local variables. */
-#define OPEN_READER(name, gb)\
-	int name##_index= (gb)->index;\
-	int name##_cache= 0;\
-
-/** Store local vars in gb. */
-#define CLOSE_READER(name, gb)\
-	(gb)->index= name##_index;\
-
-/**
- * Refill the internal cache from the bitstream.
- */
-#define UPDATE_CACHE(name, gb)\
-	name##_cache= AV_RB32( ((const uint8_t *)(gb)->buffer) \
-		+ (name##_index >> 3) ) << (name##_index & 0x07);\
-
-/**
- * Remove the next num bits from the cache.
- *
- * SKIP_COUNTER MUST be called before UPDATE_CACHE / CLOSE_READER).
- */
-#define SKIP_CACHE(name, gb, num)\
-	name##_cache <<= (num);
-
-/**
- * Increment the internal bit counter.
- *
- * \sa SKIP_CACHE, SKIP_BITS.
- */
-#define SKIP_COUNTER(name, gb, num)\
-	name##_index += (num);\
-
-/**
- * Skip over the next num bits.
- *
- * This is equivalent to SKIP_CACHE; SKIP_COUNTER.
- */
-#define SKIP_BITS(name, gb, num)\
-	{\
-		SKIP_CACHE(name, gb, num)\
-		SKIP_COUNTER(name, gb, num)\
-	}\
-
-/** This is equivalent to SKIP_LAST_CACHE; SKIP_COUNTER. */
-#define LAST_SKIP_BITS(name, gb, num) SKIP_COUNTER(name, gb, num)
-
-/** Return the next num bits. */
-#define SHOW_UBITS(name, gb, num)\
-	NEG_USR32(name##_cache, num)
-
-static inline int get_bits_count(struct getbit_context *s)
+static inline uint32_t show_bits(struct getbit_context *gbc, int num)
 {
-	return s->index;
+	int idx = gbc->index;
+	uint32_t x = AV_RB32(gbc->buffer + (idx >> 3)) << (idx & 7);
+	return x >> (32 - num);
 }
 
-/**
- * Read 1-17 bits.
- */
-static inline unsigned int get_bits(struct getbit_context *s, int n)
+static inline int get_bits_count(struct getbit_context *s)
 {
-	register int tmp;
-	OPEN_READER(re, s)
-	UPDATE_CACHE(re, s)
-	tmp = SHOW_UBITS(re, s, n);
-	LAST_SKIP_BITS(re, s, n)
-	CLOSE_READER(re, s)
-	return tmp;
+	return s->index;
 }
 
-/**
- * Show 1-17 bits.
- */
-static inline unsigned int show_bits(struct getbit_context *s, int n)
+static inline void skip_bits(struct getbit_context *s, int n)
 {
-	register int tmp;
-	OPEN_READER(re, s)
-	UPDATE_CACHE(re, s)
-	tmp = SHOW_UBITS(re, s, n);
-	return tmp;
+	s->index += n;
 }
 
-static inline void skip_bits(struct getbit_context *s, int n)
+static inline unsigned int get_bits(struct getbit_context *gbc, int n)
 {
-	/* gcc seems to optimize this to s->index+=n for the ALT_READER :)) */
-	OPEN_READER(re, s)
-	UPDATE_CACHE(re, s)
-	LAST_SKIP_BITS(re, s, n)
-	CLOSE_READER(re, s)
+	unsigned int ret = show_bits(gbc, n);
+	skip_bits(gbc, n);
+	return ret;
 }
 
 static inline unsigned int get_bits1(struct getbit_context *s)
@@ -145,60 +75,52 @@ static inline unsigned int get_bits1(struct getbit_context *s)
  * bytes larger then the actual read bits * because some optimized bitstream
  * readers read 32 or 64 bit at once and could read over the end.
  *
- * \param bit_size The size of the buffer in bits.
+ * \param bit_size The size of the buffer in bytes.
  */
 static inline void init_get_bits(struct getbit_context *s,
-		const uint8_t * buffer, int bit_size)
+		const uint8_t *buffer, int size)
 {
-	int buffer_size = (bit_size + 7) >> 3;
-	if (buffer_size < 0 || bit_size < 0) {
-		buffer_size = bit_size = 0;
-		buffer = NULL;
-	}
 	s->buffer = buffer;
-	s->size_in_bits = bit_size;
-	s->buffer_end = buffer + buffer_size;
+	s->buffer_end = buffer + size;
 	s->index = 0;
 }
 
-int init_vlc(struct vlc *vlc, int nb_bits, int nb_codes,
-	const void *bits, const void *codes, int codes_wrap, int codes_size);
+void init_vlc(struct vlc *vlc, int nb_bits, int nb_codes, const void *bits,
+		const void *codes, int codes_size);
 
 void free_vlc(struct vlc *vlc);
 
 /**
+ * Parse a vlc code.
+ *
+ * \param bits The number of bits which will be read at once, must be
+ * identical to nb_bits in init_vlc()
  *
- * if the vlc code is invalid and max_depth=1 than no bits will be removed
- * if the vlc code is invalid and max_depth>1 than the number of bits removed
- * is undefined
+ * \param max_depth The number of times bits bits must be read to completely
+ * read the longest vlc code = (max_vlc_length + bits - 1) / bits.
  */
-#define GET_VLC(code, name, gb, table, bits, max_depth)\
-{\
-    int n, index, nb_bits;\
-\
-    index= SHOW_UBITS(name, gb, bits);\
-    code = table[index][0];\
-    n    = table[index][1];\
-\
-    if(max_depth > 1 && n < 0){\
-        LAST_SKIP_BITS(name, gb, bits)\
-        UPDATE_CACHE(name, gb)\
-\
-        nb_bits = -n;\
-\
-        index= SHOW_UBITS(name, gb, nb_bits) + code;\
-        code = table[index][0];\
-        n    = table[index][1];\
-        if(max_depth > 2 && n < 0){\
-            LAST_SKIP_BITS(name, gb, nb_bits)\
-            UPDATE_CACHE(name, gb)\
-\
-            nb_bits = -n;\
-\
-            index= SHOW_UBITS(name, gb, nb_bits) + code;\
-            code = table[index][0];\
-            n    = table[index][1];\
-        }\
-    }\
-    SKIP_BITS(name, gb, n)\
+static inline int get_vlc(struct getbit_context *gb, VLC_TYPE(*table)[2],
+		int bits, int max_depth)
+{
+	int n, idx, nb_bits, code;
+
+	idx = show_bits(gb, bits);
+	code = table[idx][0];
+	n = table[idx][1];
+	if (max_depth > 1 && n < 0) {
+		skip_bits(gb, bits);
+		nb_bits = -n;
+		idx = show_bits(gb, nb_bits) + code;
+		code = table[idx][0];
+		n = table[idx][1];
+		if (max_depth > 2 && n < 0) {
+			skip_bits(gb, nb_bits);
+			nb_bits = -n;
+			idx = show_bits(gb, nb_bits) + code;
+			code = table[idx][0];
+			n = table[idx][1];
+		}
+	}
+	skip_bits(gb, n);
+	return code;
 }