X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fget_bits.h;h=ea7e0c450937a51bbcb05791bd4e2484e3399dcb;hb=380146924ecad2e05e9dcc5c3c2e1b5ba47c51e8;hp=79802848d432dc50778e45aaca0a744a26af16ab;hpb=58c42af722cebecd86e340dc3ed9ec44b1fe4a55;p=ffmpeg diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 79802848d43..ea7e0c45093 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -27,40 +27,36 @@ #define AVCODEC_GET_BITS_H #include -#include -#include -#include "libavutil/bswap.h" + #include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "mathops.h" -#if defined(ALT_BITSTREAM_READER_LE) && !defined(ALT_BITSTREAM_READER) -# define ALT_BITSTREAM_READER -#endif - -#if !defined(A32_BITSTREAM_READER) && !defined(ALT_BITSTREAM_READER) -# if ARCH_ARM && !HAVE_FAST_UNALIGNED -# define A32_BITSTREAM_READER -# else -# define ALT_BITSTREAM_READER -//#define A32_BITSTREAM_READER -# endif +/* + * Safe bitstream reading: + * optionally, the get_bits API can check to ensure that we + * don't read past input buffer boundaries. This is protected + * with CONFIG_SAFE_BITSTREAM_READER at the global level, and + * then below that with UNCHECKED_BITSTREAM_READER at the per- + * decoder level. This means that decoders that check internally + * can "#define UNCHECKED_BITSTREAM_READER 1" to disable + * overread checks. + * Boundary checking causes a minor performance penalty so for + * applications that won't want/need this, it can be disabled + * globally using "#define CONFIG_SAFE_BITSTREAM_READER 0". + */ +#ifndef UNCHECKED_BITSTREAM_READER +#define UNCHECKED_BITSTREAM_READER !CONFIG_SAFE_BITSTREAM_READER #endif -/* bit input */ -/* buffer, buffer_end and size_in_bits must be present and used by every reader */ typedef struct GetBitContext { const uint8_t *buffer, *buffer_end; -#ifdef ALT_BITSTREAM_READER int index; -#elif defined A32_BITSTREAM_READER - uint32_t *buffer_ptr; - uint32_t cache0; - uint32_t cache1; - int bit_count; -#endif int size_in_bits; +#if !UNCHECKED_BITSTREAM_READER + int size_in_bits_plus8; +#endif } GetBitContext; #define VLC_TYPE int16_t @@ -78,187 +74,158 @@ typedef struct RL_VLC_ELEM { } RL_VLC_ELEM; /* Bitstream reader API docs: -name - arbitrary name which is used as prefix for the internal variables - -gb - getbitcontext - -OPEN_READER(name, gb) - load gb into local variables - -CLOSE_READER(name, gb) - store local vars in gb - -UPDATE_CACHE(name, gb) - refill the internal cache from the bitstream - after this call at least MIN_CACHE_BITS will be available, - -GET_CACHE(name, gb) - will output the contents of the internal cache, next bit is MSB of 32 or 64 bit (FIXME 64bit) - -SHOW_UBITS(name, gb, num) - will return the next num bits - -SHOW_SBITS(name, gb, num) - will return the next num bits and do sign extension - -SKIP_BITS(name, gb, num) - will skip over the next num bits - note, this is equivalent to SKIP_CACHE; SKIP_COUNTER - -SKIP_CACHE(name, gb, num) - will remove the next num bits from the cache (note SKIP_COUNTER MUST be called before UPDATE_CACHE / CLOSE_READER) - -SKIP_COUNTER(name, gb, num) - will increment the internal bit counter (see SKIP_CACHE & SKIP_BITS) + * name + * arbitrary name which is used as prefix for the internal variables + * + * gb + * getbitcontext + * + * OPEN_READER(name, gb) + * load gb into local variables + * + * CLOSE_READER(name, gb) + * store local vars in gb + * + * UPDATE_CACHE(name, gb) + * Refill the internal cache from the bitstream. + * After this call at least MIN_CACHE_BITS will be available. + * + * GET_CACHE(name, gb) + * Will output the contents of the internal cache, + * next bit is MSB of 32 or 64 bit (FIXME 64bit). + * + * SHOW_UBITS(name, gb, num) + * Will return the next num bits. + * + * SHOW_SBITS(name, gb, num) + * Will return the next num bits and do sign extension. + * + * SKIP_BITS(name, gb, num) + * Will skip over the next num bits. + * Note, this is equivalent to SKIP_CACHE; SKIP_COUNTER. + * + * SKIP_CACHE(name, gb, num) + * Will remove the next num bits from the cache (note SKIP_COUNTER + * MUST be called before UPDATE_CACHE / CLOSE_READER). + * + * SKIP_COUNTER(name, gb, num) + * Will increment the internal bit counter (see SKIP_CACHE & SKIP_BITS). + * + * LAST_SKIP_BITS(name, gb, num) + * Like SKIP_BITS, to be used if next call is UPDATE_CACHE or CLOSE_READER. + * + * For examples see get_bits, show_bits, skip_bits, get_vlc. + */ -LAST_SKIP_CACHE(name, gb, num) - will remove the next num bits from the cache if it is needed for UPDATE_CACHE otherwise it will do nothing +#ifdef LONG_BITSTREAM_READER +# define MIN_CACHE_BITS 32 +#else +# define MIN_CACHE_BITS 25 +#endif -LAST_SKIP_BITS(name, gb, num) - is equivalent to LAST_SKIP_CACHE; SKIP_COUNTER +#define OPEN_READER_NOSIZE(name, gb) \ + unsigned int name ## _index = (gb)->index; \ + unsigned int av_unused name ## _cache = 0 -for examples see get_bits, show_bits, skip_bits, get_vlc -*/ +#if UNCHECKED_BITSTREAM_READER +#define OPEN_READER(name, gb) OPEN_READER_NOSIZE(name, gb) -#ifdef ALT_BITSTREAM_READER -# define MIN_CACHE_BITS 25 +#define BITS_AVAILABLE(name, gb) 1 +#else +#define OPEN_READER(name, gb) \ + OPEN_READER_NOSIZE(name, gb); \ + unsigned int name ## _size_plus8 = (gb)->size_in_bits_plus8 -# define OPEN_READER(name, gb) \ - unsigned int name##_index = (gb)->index; \ - unsigned int av_unused name##_cache = 0 +#define BITS_AVAILABLE(name, gb) name ## _index < name ## _size_plus8 +#endif -# define CLOSE_READER(name, gb) (gb)->index = name##_index +#define CLOSE_READER(name, gb) (gb)->index = name ## _index -# ifdef ALT_BITSTREAM_READER_LE -# define UPDATE_CACHE(name, gb) \ - name##_cache = AV_RL32(((const uint8_t *)(gb)->buffer)+(name##_index>>3)) >> (name##_index&0x07) +#ifdef BITSTREAM_READER_LE -# define SKIP_CACHE(name, gb, num) name##_cache >>= (num) +# ifdef LONG_BITSTREAM_READER +# define UPDATE_CACHE(name, gb) name ## _cache = \ + AV_RL64((gb)->buffer + (name ## _index >> 3)) >> (name ## _index & 7) # else -# define UPDATE_CACHE(name, gb) \ - name##_cache = AV_RB32(((const uint8_t *)(gb)->buffer)+(name##_index>>3)) << (name##_index&0x07) - -# define SKIP_CACHE(name, gb, num) name##_cache <<= (num) +# define UPDATE_CACHE(name, gb) name ## _cache = \ + AV_RL32((gb)->buffer + (name ## _index >> 3)) >> (name ## _index & 7) # endif -// FIXME name? -# define SKIP_COUNTER(name, gb, num) name##_index += (num) +# define SKIP_CACHE(name, gb, num) name ## _cache >>= (num) -# define SKIP_BITS(name, gb, num) do { \ - SKIP_CACHE(name, gb, num); \ - SKIP_COUNTER(name, gb, num); \ - } while (0) - -# define LAST_SKIP_BITS(name, gb, num) SKIP_COUNTER(name, gb, num) -# define LAST_SKIP_CACHE(name, gb, num) - -# ifdef ALT_BITSTREAM_READER_LE -# define SHOW_UBITS(name, gb, num) zero_extend(name##_cache, num) +#else -# define SHOW_SBITS(name, gb, num) sign_extend(name##_cache, num) +# ifdef LONG_BITSTREAM_READER +# define UPDATE_CACHE(name, gb) name ## _cache = \ + AV_RB64((gb)->buffer + (name ## _index >> 3)) >> (32 - (name ## _index & 7)) # else -# define SHOW_UBITS(name, gb, num) NEG_USR32(name##_cache, num) - -# define SHOW_SBITS(name, gb, num) NEG_SSR32(name##_cache, num) +# define UPDATE_CACHE(name, gb) name ## _cache = \ + AV_RB32((gb)->buffer + (name ## _index >> 3)) << (name ## _index & 7) # endif -# define GET_CACHE(name, gb) ((uint32_t)name##_cache) - -static inline int get_bits_count(const GetBitContext *s){ - return s->index; -} - -static inline void skip_bits_long(GetBitContext *s, int n){ - s->index += n; -} - -#elif defined A32_BITSTREAM_READER +# define SKIP_CACHE(name, gb, num) name ## _cache <<= (num) -# define MIN_CACHE_BITS 32 - -# define OPEN_READER(name, gb) \ - int name##_bit_count = (gb)->bit_count; \ - uint32_t name##_cache0 = (gb)->cache0; \ - uint32_t name##_cache1 = (gb)->cache1; \ - uint32_t *name##_buffer_ptr = (gb)->buffer_ptr - -# define CLOSE_READER(name, gb) do { \ - (gb)->bit_count = name##_bit_count; \ - (gb)->cache0 = name##_cache0; \ - (gb)->cache1 = name##_cache1; \ - (gb)->buffer_ptr = name##_buffer_ptr; \ - } while (0) - -# define UPDATE_CACHE(name, gb) do { \ - if(name##_bit_count > 0){ \ - const uint32_t next = av_be2ne32(*name##_buffer_ptr); \ - name##_cache0 |= NEG_USR32(next, name##_bit_count); \ - name##_cache1 |= next << name##_bit_count; \ - name##_buffer_ptr++; \ - name##_bit_count -= 32; \ - } \ - } while (0) - -# define SKIP_CACHE(name, gb, num) do { \ - name##_cache0 <<= (num); \ - name##_cache0 |= NEG_USR32(name##_cache1,num); \ - name##_cache1 <<= (num); \ - } while (0) +#endif -# define SKIP_COUNTER(name, gb, num) name##_bit_count += (num) +#if UNCHECKED_BITSTREAM_READER +# define SKIP_COUNTER(name, gb, num) name ## _index += (num) +#else +# define SKIP_COUNTER(name, gb, num) \ + name ## _index = FFMIN(name ## _size_plus8, name ## _index + (num)) +#endif -# define SKIP_BITS(name, gb, num) do { \ +#define SKIP_BITS(name, gb, num) \ + do { \ SKIP_CACHE(name, gb, num); \ SKIP_COUNTER(name, gb, num); \ } while (0) -# define LAST_SKIP_BITS(name, gb, num) SKIP_BITS(name, gb, num) -# define LAST_SKIP_CACHE(name, gb, num) SKIP_CACHE(name, gb, num) - -# define SHOW_UBITS(name, gb, num) NEG_USR32(name##_cache0, num) +#define LAST_SKIP_BITS(name, gb, num) SKIP_COUNTER(name, gb, num) -# define SHOW_SBITS(name, gb, num) NEG_SSR32(name##_cache0, num) - -# define GET_CACHE(name, gb) name##_cache0 +#ifdef BITSTREAM_READER_LE +# define SHOW_UBITS(name, gb, num) zero_extend(name ## _cache, num) +# define SHOW_SBITS(name, gb, num) sign_extend(name ## _cache, num) +#else +# define SHOW_UBITS(name, gb, num) NEG_USR32(name ## _cache, num) +# define SHOW_SBITS(name, gb, num) NEG_SSR32(name ## _cache, num) +#endif -static inline int get_bits_count(const GetBitContext *s) { - return ((uint8_t*)s->buffer_ptr - s->buffer)*8 - 32 + s->bit_count; -} +#define GET_CACHE(name, gb) ((uint32_t) name ## _cache) -static inline void skip_bits_long(GetBitContext *s, int n){ - OPEN_READER(re, s); - re_bit_count += n; - re_buffer_ptr += re_bit_count>>5; - re_bit_count &= 31; - re_cache0 = av_be2ne32(re_buffer_ptr[-1]) << re_bit_count; - re_cache1 = 0; - UPDATE_CACHE(re, s); - CLOSE_READER(re, s); +static inline int get_bits_count(const GetBitContext *s) +{ + return s->index; } +static inline void skip_bits_long(GetBitContext *s, int n) +{ +#if UNCHECKED_BITSTREAM_READER + s->index += n; +#else + s->index += av_clip(n, -s->index, s->size_in_bits_plus8 - s->index); #endif +} /** * read mpeg1 dc style vlc (sign bit + mantisse with no MSB). * if MSB not set it is negative * @param n length in bits - * @author BERO */ -static inline int get_xbits(GetBitContext *s, int n){ +static inline int get_xbits(GetBitContext *s, int n) +{ register int sign; register int32_t cache; OPEN_READER(re, s); UPDATE_CACHE(re, s); cache = GET_CACHE(re, s); - sign = ~cache >> 31; + sign = ~cache >> 31; LAST_SKIP_BITS(re, s, n); CLOSE_READER(re, s); return (NEG_USR32(sign ^ cache, n) ^ sign) - sign; } -static inline int get_sbits(GetBitContext *s, int n){ +static inline int get_sbits(GetBitContext *s, int n) +{ register int tmp; OPEN_READER(re, s); UPDATE_CACHE(re, s); @@ -271,7 +238,8 @@ static inline int get_sbits(GetBitContext *s, int n){ /** * Read 1-25 bits. */ -static inline unsigned int get_bits(GetBitContext *s, int n){ +static inline unsigned int get_bits(GetBitContext *s, int n) +{ register int tmp; OPEN_READER(re, s); UPDATE_CACHE(re, s); @@ -284,62 +252,85 @@ static inline unsigned int get_bits(GetBitContext *s, int n){ /** * Show 1-25 bits. */ -static inline unsigned int show_bits(GetBitContext *s, int n){ +static inline unsigned int show_bits(GetBitContext *s, int n) +{ register int tmp; - OPEN_READER(re, s); + OPEN_READER_NOSIZE(re, s); UPDATE_CACHE(re, s); tmp = SHOW_UBITS(re, s, n); return tmp; } -static inline void skip_bits(GetBitContext *s, int n){ - //Note gcc seems to optimize this to s->index+=n for the ALT_READER :)) +static inline void skip_bits(GetBitContext *s, int n) +{ OPEN_READER(re, s); UPDATE_CACHE(re, s); LAST_SKIP_BITS(re, s, n); CLOSE_READER(re, s); } -static inline unsigned int get_bits1(GetBitContext *s){ -#ifdef ALT_BITSTREAM_READER +static inline unsigned int get_bits1(GetBitContext *s) +{ unsigned int index = s->index; - uint8_t result = s->buffer[index>>3]; -#ifdef ALT_BITSTREAM_READER_LE + uint8_t result = s->buffer[index >> 3]; +#ifdef BITSTREAM_READER_LE result >>= index & 7; - result &= 1; + result &= 1; #else result <<= index & 7; result >>= 8 - 1; #endif - index++; +#if !UNCHECKED_BITSTREAM_READER + if (s->index < s->size_in_bits_plus8) +#endif + index++; s->index = index; return result; -#else - return get_bits(s, 1); -#endif } -static inline unsigned int show_bits1(GetBitContext *s){ +static inline unsigned int show_bits1(GetBitContext *s) +{ return show_bits(s, 1); } -static inline void skip_bits1(GetBitContext *s){ +static inline void skip_bits1(GetBitContext *s) +{ skip_bits(s, 1); } /** * Read 0-32 bits. */ -static inline unsigned int get_bits_long(GetBitContext *s, int n){ - if (n <= MIN_CACHE_BITS) return get_bits(s, n); - else { -#ifdef ALT_BITSTREAM_READER_LE +static inline unsigned int get_bits_long(GetBitContext *s, int n) +{ + if (n <= MIN_CACHE_BITS) { + return get_bits(s, n); + } else { +#ifdef BITSTREAM_READER_LE int ret = get_bits(s, 16); - return ret | (get_bits(s, n-16) << 16); + return ret | (get_bits(s, n - 16) << 16); #else - int ret = get_bits(s, 16) << (n-16); - return ret | get_bits(s, n-16); + int ret = get_bits(s, 16) << (n - 16); + return ret | get_bits(s, n - 16); +#endif + } +} + +/* + * Read 0-64 bits. + */ +static inline uint64_t get_bits64(GetBitContext *s, int n) +{ + if (n <= 32) { + return get_bits_long(s, n); + } else { +#ifdef BITSTREAM_READER_LE + uint64_t ret = get_bits_long(s, 32); + return ret | (uint64_t) get_bits_long(s, n - 32) << 32; +#else + uint64_t ret = (uint64_t) get_bits_long(s, n - 32) << 32; + return ret | get_bits_long(s, 32); #endif } } @@ -347,16 +338,19 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n){ /** * Read 0-32 bits as a signed integer. */ -static inline int get_sbits_long(GetBitContext *s, int n) { +static inline int get_sbits_long(GetBitContext *s, int n) +{ return sign_extend(get_bits_long(s, n), n); } /** * Show 0-32 bits. */ -static inline unsigned int show_bits_long(GetBitContext *s, int n){ - if (n <= MIN_CACHE_BITS) return show_bits(s, n); - else { +static inline unsigned int show_bits_long(GetBitContext *s, int n) +{ + if (n <= MIN_CACHE_BITS) { + return show_bits(s, n); + } else { GetBitContext gb = *s; return get_bits_long(&gb, n); } @@ -372,73 +366,96 @@ static inline int check_marker(GetBitContext *s, const char *msg) } /** - * Inititalize GetBitContext. - * @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes larger than the actual read bits - * because some optimized bitstream readers read 32 or 64 bit at once and could read over the end + * Initialize GetBitContext. + * @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes + * larger than 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 - * - * While GetBitContext stores the buffer size, for performance reasons you are - * responsible for checking for the buffer end yourself (take advantage of the padding)! + * @return 0 on success, AVERROR_INVALIDDATA if the buffer_size would overflow. */ -static inline void init_get_bits(GetBitContext *s, - const uint8_t *buffer, int bit_size) +static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer, + int bit_size) { - int buffer_size = (bit_size+7)>>3; - if (buffer_size < 0 || bit_size < 0) { - buffer_size = bit_size = 0; - buffer = NULL; + int buffer_size; + int ret = 0; + + if (bit_size > INT_MAX - 7 || bit_size < 0 || !buffer) { + bit_size = 0; + buffer = NULL; + ret = AVERROR_INVALIDDATA; } - s->buffer = buffer; - s->size_in_bits = bit_size; - s->buffer_end = buffer + buffer_size; -#ifdef ALT_BITSTREAM_READER - s->index = 0; -#elif defined A32_BITSTREAM_READER - s->buffer_ptr = (uint32_t*)((intptr_t)buffer & ~3); - s->bit_count = 32 + 8*((intptr_t)buffer & 3); - skip_bits_long(s, 0); + buffer_size = (bit_size + 7) >> 3; + + s->buffer = buffer; + s->size_in_bits = bit_size; +#if !UNCHECKED_BITSTREAM_READER + s->size_in_bits_plus8 = bit_size + 8; #endif + s->buffer_end = buffer + buffer_size; + s->index = 0; + + return ret; } -static inline void align_get_bits(GetBitContext *s) +/** + * Initialize GetBitContext. + * @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes + * larger than the actual read bits because some optimized bitstream + * readers read 32 or 64 bit at once and could read over the end + * @param byte_size the size of the buffer in bytes + * @return 0 on success, AVERROR_INVALIDDATA if the buffer_size would overflow. + */ +static inline int init_get_bits8(GetBitContext *s, const uint8_t *buffer, + int byte_size) +{ + if (byte_size > INT_MAX / 8) + return AVERROR_INVALIDDATA; + return init_get_bits(s, buffer, byte_size * 8); +} + +static inline const uint8_t *align_get_bits(GetBitContext *s) { int n = -get_bits_count(s) & 7; - if (n) skip_bits(s, n); + if (n) + skip_bits(s, n); + return s->buffer + (s->index >> 3); } #define init_vlc(vlc, nb_bits, nb_codes, \ bits, bits_wrap, bits_size, \ codes, codes_wrap, codes_size, \ flags) \ - init_vlc_sparse(vlc, nb_bits, nb_codes, \ - bits, bits_wrap, bits_size, \ - codes, codes_wrap, codes_size, \ - NULL, 0, 0, flags) - -int init_vlc_sparse(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 *symbols, int symbols_wrap, int symbols_size, - int flags); -#define INIT_VLC_LE 2 + ff_init_vlc_sparse(vlc, nb_bits, nb_codes, \ + bits, bits_wrap, bits_size, \ + codes, codes_wrap, codes_size, \ + NULL, 0, 0, flags) + +int ff_init_vlc_sparse(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 *symbols, int symbols_wrap, int symbols_size, + int flags); +void ff_free_vlc(VLC *vlc); + +#define INIT_VLC_LE 2 #define INIT_VLC_USE_NEW_STATIC 4 -void free_vlc(VLC *vlc); -#define INIT_VLC_STATIC(vlc, bits, a,b,c,d,e,f,g, static_size) do { \ - static VLC_TYPE table[static_size][2]; \ - (vlc)->table = table; \ - (vlc)->table_allocated = static_size; \ - init_vlc(vlc, bits, a,b,c,d,e,f,g, INIT_VLC_USE_NEW_STATIC); \ +#define INIT_VLC_STATIC(vlc, bits, a, b, c, d, e, f, g, static_size) \ + do { \ + static VLC_TYPE table[static_size][2]; \ + (vlc)->table = table; \ + (vlc)->table_allocated = static_size; \ + init_vlc(vlc, bits, a, b, c, d, e, f, g, INIT_VLC_USE_NEW_STATIC); \ } while (0) - /** * If the vlc code is invalid and max_depth=1, then no bits will be removed. * If the vlc code is invalid and max_depth>1, then the number of bits removed * is undefined. */ -#define GET_VLC(code, name, gb, table, bits, max_depth) do { \ +#define GET_VLC(code, name, gb, table, bits, max_depth) \ + do { \ int n, nb_bits; \ unsigned int index; \ \ @@ -469,33 +486,34 @@ void free_vlc(VLC *vlc); SKIP_BITS(name, gb, n); \ } while (0) -#define GET_RL_VLC(level, run, name, gb, table, bits, max_depth, need_update) do { \ - int n, nb_bits; \ - unsigned int index; \ - \ - index = SHOW_UBITS(name, gb, bits); \ - level = table[index].level; \ - n = table[index].len; \ - \ - if (max_depth > 1 && n < 0) { \ - SKIP_BITS(name, gb, bits); \ - if (need_update) { \ - UPDATE_CACHE(name, gb); \ - } \ - \ - nb_bits = -n; \ - \ - index = SHOW_UBITS(name, gb, nb_bits) + level; \ - level = table[index].level; \ - n = table[index].len; \ - } \ - run = table[index].run; \ - SKIP_BITS(name, gb, n); \ +#define GET_RL_VLC(level, run, name, gb, table, bits, \ + max_depth, need_update) \ + do { \ + int n, nb_bits; \ + unsigned int index; \ + \ + index = SHOW_UBITS(name, gb, bits); \ + level = table[index].level; \ + n = table[index].len; \ + \ + if (max_depth > 1 && n < 0) { \ + SKIP_BITS(name, gb, bits); \ + if (need_update) { \ + UPDATE_CACHE(name, gb); \ + } \ + \ + nb_bits = -n; \ + \ + index = SHOW_UBITS(name, gb, nb_bits) + level; \ + level = table[index].level; \ + n = table[index].len; \ + } \ + run = table[index].run; \ + SKIP_BITS(name, gb, n); \ } while (0) - /** - * Parse a vlc code, faster than get_vlc(). + * Parse a vlc code. * @param bits is the number of bits which will be read at once, must be * identical to nb_bits in init_vlc() * @param max_depth is the number of times bits bits must be read to completely @@ -503,7 +521,7 @@ void free_vlc(VLC *vlc); * = (max_vlc_length + bits - 1) / bits */ static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], - int bits, int max_depth) + int bits, int max_depth) { int code; @@ -513,10 +531,12 @@ static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], GET_VLC(code, re, s, table, bits, max_depth); CLOSE_READER(re, s); + return code; } -static inline int decode012(GetBitContext *gb){ +static inline int decode012(GetBitContext *gb) +{ int n; n = get_bits1(gb); if (n == 0) @@ -525,7 +545,8 @@ static inline int decode012(GetBitContext *gb){ return get_bits1(gb) + 1; } -static inline int decode210(GetBitContext *gb){ +static inline int decode210(GetBitContext *gb) +{ if (get_bits1(gb)) return 0; else @@ -540,61 +561,65 @@ static inline int get_bits_left(GetBitContext *gb) //#define TRACE #ifdef TRACE -static inline void print_bin(int bits, int n){ +static inline void print_bin(int bits, int n) +{ int i; - for (i = n-1; i >= 0; i--) { - av_log(NULL, AV_LOG_DEBUG, "%d", (bits>>i)&1); - } + for (i = n - 1; i >= 0; i--) + av_log(NULL, AV_LOG_DEBUG, "%d", (bits >> i) & 1); for (i = n; i < 24; i++) av_log(NULL, AV_LOG_DEBUG, " "); } -static inline int get_bits_trace(GetBitContext *s, int n, char *file, - const char *func, int line){ +static inline int get_bits_trace(GetBitContext *s, int n, const char *file, + const char *func, int line) +{ int r = get_bits(s, n); print_bin(r, n); av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d bit @%5d in %s %s:%d\n", - r, n, r, get_bits_count(s)-n, file, func, line); + r, n, r, get_bits_count(s) - n, file, func, line); + return r; } + static inline int get_vlc_trace(GetBitContext *s, VLC_TYPE (*table)[2], - int bits, int max_depth, char *file, - const char *func, int line){ + int bits, int max_depth, const char *file, + const char *func, int line) +{ int show = show_bits(s, 24); int pos = get_bits_count(s); int r = get_vlc2(s, table, bits, max_depth); int len = get_bits_count(s) - pos; - int bits2 = show >> (24-len); + int bits2 = show >> (24 - len); print_bin(bits2, len); av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d vlc @%5d in %s %s:%d\n", bits2, len, r, pos, file, func, line); + return r; } -static inline int get_xbits_trace(GetBitContext *s, int n, char *file, - const char *func, int line){ + +static inline int get_xbits_trace(GetBitContext *s, int n, const char *file, + const char *func, int line) +{ int show = show_bits(s, n); int r = get_xbits(s, n); print_bin(show, n); av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d xbt @%5d in %s %s:%d\n", - show, n, r, get_bits_count(s)-n, file, func, line); + show, n, r, get_bits_count(s) - n, file, func, line); + return r; } -#define get_bits(s, n) get_bits_trace(s, n, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#define get_bits1(s) get_bits_trace(s, 1, __FILE__, __PRETTY_FUNCTION__, __LINE__) +#define get_bits(s, n) get_bits_trace(s , n, __FILE__, __PRETTY_FUNCTION__, __LINE__) +#define get_bits1(s) get_bits_trace(s, 1, __FILE__, __PRETTY_FUNCTION__, __LINE__) #define get_xbits(s, n) get_xbits_trace(s, n, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#define get_vlc(s, vlc) get_vlc_trace(s, (vlc)->table, (vlc)->bits, 3, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#define get_vlc2(s, tab, bits, max) get_vlc_trace(s, tab, bits, max, __FILE__, __PRETTY_FUNCTION__, __LINE__) - -#define tprintf(p, ...) av_log(p, AV_LOG_DEBUG, __VA_ARGS__) -#else //TRACE -#define tprintf(p, ...) {} +#define get_vlc(s, vlc) get_vlc_trace(s, (vlc)->table, (vlc)->bits, 3, __FILE__, __PRETTY_FUNCTION__, __LINE__) +#define get_vlc2(s, tab, bits, max) get_vlc_trace(s, tab, bits, max, __FILE__, __PRETTY_FUNCTION__, __LINE__) #endif #endif /* AVCODEC_GET_BITS_H */