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

diff --git a/bitstream.h b/bitstream.h
index 7f944dbf..88b62f94 100644
--- a/bitstream.h
+++ b/bitstream.h
@@ -9,11 +9,6 @@
 
 /** \file bitstream.h Bitstream structures and inline functions. */
 
-#define AV_RB32(x)  ((((const uint8_t*)(x))[0] << 24) | \
-                     (((const uint8_t*)(x))[1] << 16) | \
-                     (((const uint8_t*)(x))[2] <<  8) | \
-                      ((const uint8_t*)(x))[3])
-
 /** Structure for bistream I/O. */
 struct getbit_context {
 	/* Start of the internal buffer. */
@@ -35,18 +30,19 @@ struct vlc {
 static inline uint32_t show_bits(struct getbit_context *gbc, int num)
 {
 	int idx = gbc->index;
-	uint32_t x = AV_RB32(gbc->buffer + (idx >> 3)) << (idx & 7);
-	return x >> (32 - num);
+	const uint8_t *p = gbc->buffer + (idx >> 3);
+	uint32_t x = ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
+	return (x << (idx & 7)) >> (32 - num);
 }
 
-static inline int get_bits_count(struct getbit_context *s)
+static inline int get_bits_count(struct getbit_context *gbc)
 {
-	return s->index;
+	return gbc->index;
 }
 
-static inline void skip_bits(struct getbit_context *s, int n)
+static inline void skip_bits(struct getbit_context *gbc, int n)
 {
-	s->index += n;
+	gbc->index += n;
 }
 
 static inline unsigned int get_bits(struct getbit_context *gbc, int n)
@@ -56,16 +52,12 @@ static inline unsigned int get_bits(struct getbit_context *gbc, int n)
 	return ret;
 }
 
-static inline unsigned int get_bits1(struct getbit_context *s)
+/* This is rather hot, we can do better than get_bits(gbc, 1). */
+static inline unsigned int get_bit(struct getbit_context *gbc)
 {
-	int idx = s->index;
-	uint8_t result = s->buffer[idx >> 3];
-
-	result <<= (idx & 0x07);
-	result >>= 8 - 1;
-	idx++;
-	s->index = idx;
-	return result;
+	int idx = gbc->index++;
+	uint8_t tmp = gbc->buffer[idx >> 3], mask = (1 << (7 - (idx & 7)));
+	return !!(tmp & mask);
 }
 
 /**
@@ -77,12 +69,12 @@ static inline unsigned int get_bits1(struct getbit_context *s)
  *
  * \param bit_size The size of the buffer in bytes.
  */
-static inline void init_get_bits(struct getbit_context *s,
+static inline void init_get_bits(struct getbit_context *gbc,
 		const uint8_t *buffer, int size)
 {
-	s->buffer = buffer;
-	s->buffer_end = buffer + size;
-	s->index = 0;
+	gbc->buffer = buffer;
+	gbc->buffer_end = buffer + size;
+	gbc->index = 0;
 }
 
 void init_vlc(struct vlc *vlc, int nb_bits, int nb_codes, const void *bits,
@@ -99,28 +91,28 @@ void free_vlc(struct vlc *vlc);
  * \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.
  */
-static inline int get_vlc(struct getbit_context *gb, VLC_TYPE(*table)[2],
+static inline int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2],
 		int bits, int max_depth)
 {
 	int n, idx, nb_bits, code;
 
-	idx = show_bits(gb, bits);
+	idx = show_bits(gbc, bits);
 	code = table[idx][0];
 	n = table[idx][1];
 	if (max_depth > 1 && n < 0) {
-		skip_bits(gb, bits);
+		skip_bits(gbc, bits);
 		nb_bits = -n;
-		idx = show_bits(gb, nb_bits) + code;
+		idx = show_bits(gbc, nb_bits) + code;
 		code = table[idx][0];
 		n = table[idx][1];
 		if (max_depth > 2 && n < 0) {
-			skip_bits(gb, nb_bits);
+			skip_bits(gbc, nb_bits);
 			nb_bits = -n;
-			idx = show_bits(gb, nb_bits) + code;
+			idx = show_bits(gbc, nb_bits) + code;
 			code = table[idx][0];
 			n = table[idx][1];
 		}
 	}
-	skip_bits(gb, n);
+	skip_bits(gbc, n);
 	return code;
 }