From bebb74fdee22f723755267b1e0c4b3708516e619 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 18 Oct 2009 18:37:09 +0200 Subject: [PATCH] Remove LAST_SKIP_BITS. --- bitstream.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/bitstream.h b/bitstream.h index df2c0b8b..f54ae62b 100644 --- a/bitstream.h +++ b/bitstream.h @@ -77,9 +77,6 @@ struct vlc { 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) @@ -98,7 +95,7 @@ static inline unsigned int get_bits(struct getbit_context *s, int n) OPEN_READER(re, s) UPDATE_CACHE(re, s) tmp = SHOW_UBITS(re, s, n); - LAST_SKIP_BITS(re, s, n) + SKIP_COUNTER(re, s, n) CLOSE_READER(re, s) return tmp; } @@ -108,7 +105,7 @@ static inline void skip_bits(struct getbit_context *s, 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) + SKIP_COUNTER(re, s, n) CLOSE_READER(re, s) } @@ -171,14 +168,14 @@ static inline int get_vlc(struct getbit_context *gb, VLC_TYPE(*table)[2], code = table[idx][0]; n = table[idx][1]; if (max_depth > 1 && n < 0) { - LAST_SKIP_BITS(re, gb, bits) + SKIP_COUNTER(re, gb, bits) UPDATE_CACHE(re, gb) nb_bits = -n; idx = SHOW_UBITS(re, gb, nb_bits) + code; code = table[idx][0]; n = table[idx][1]; if (max_depth > 2 && n < 0) { - LAST_SKIP_BITS(re, gb, nb_bits) + SKIP_COUNTER(re, gb, nb_bits) UPDATE_CACHE(re, gb) nb_bits = -n; idx = SHOW_UBITS(re, gb, nb_bits) + code; -- 2.30.2