Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sanitise get_bits macros, part 2

Browse Source 
These whitespace changes improve the readability of the get_bits
macros.

Signed-off-by: Mans Rullgard <mans@mansr.com>
oldabi
Mans Rullgard 14 years ago
parent bf5f9b528b
commit fb5c841d5f
1 changed files with 182 additions and 196 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 90
      libavcodec/get_bits.h

90
libavcodec/get_bits.h
Unescape View File

@ -129,29 +129,24 @@ for examples see get_bits, show_bits, skip_bits, get_vlc
unsigned int name##_index = (gb)->index; \ unsigned int name##_index = (gb)->index; \
int name##_cache = 0 int name##_cache = 0
# define CLOSE_READER(name, gb)\ # define CLOSE_READER(name, gb) (gb)->index = name##_index
(gb)->index= name##_index
# ifdef ALT_BITSTREAM_READER_LE # ifdef ALT_BITSTREAM_READER_LE
# define UPDATE_CACHE(name, gb) \ # define UPDATE_CACHE(name, gb) \
name##_cache = AV_RL32(((const uint8_t *)(gb)->buffer)+(name##_index>>3)) >> (name##_index&0x07) name##_cache = AV_RL32(((const uint8_t *)(gb)->buffer)+(name##_index>>3)) >> (name##_index&0x07)
# define SKIP_CACHE(name, gb, num)\ # define SKIP_CACHE(name, gb, num) name##_cache >>= (num)
name##_cache >>= (num)
# else # else
# define UPDATE_CACHE(name, gb) \ # define UPDATE_CACHE(name, gb) \
name##_cache = AV_RB32(((const uint8_t *)(gb)->buffer)+(name##_index>>3)) << (name##_index&0x07) name##_cache = AV_RB32(((const uint8_t *)(gb)->buffer)+(name##_index>>3)) << (name##_index&0x07)
# define SKIP_CACHE(name, gb, num)\ # define SKIP_CACHE(name, gb, num) name##_cache <<= (num)
name##_cache <<= (num)
# endif # endif
// FIXME name? // FIXME name?
# define SKIP_COUNTER(name, gb, num)\ # define SKIP_COUNTER(name, gb, num) name##_index += (num)
name##_index += (num)
# define SKIP_BITS(name, gb, num)\ # define SKIP_BITS(name, gb, num) do { \
do {\
SKIP_CACHE(name, gb, num); \ SKIP_CACHE(name, gb, num); \
SKIP_COUNTER(name, gb, num); \ SKIP_COUNTER(name, gb, num); \
} while (0) } while (0)
@ -160,21 +155,16 @@ for examples see get_bits, show_bits, skip_bits, get_vlc
# define LAST_SKIP_CACHE(name, gb, num) # define LAST_SKIP_CACHE(name, gb, num)
# ifdef ALT_BITSTREAM_READER_LE # ifdef ALT_BITSTREAM_READER_LE
# define SHOW_UBITS(name, gb, num)\ # define SHOW_UBITS(name, gb, num) zero_extend(name##_cache, num)
zero_extend(name##_cache, num)
# define SHOW_SBITS(name, gb, num)\ # define SHOW_SBITS(name, gb, num) sign_extend(name##_cache, num)
sign_extend(name##_cache, num)
# else # else
# define SHOW_UBITS(name, gb, num)\ # define SHOW_UBITS(name, gb, num) NEG_USR32(name##_cache, num)
NEG_USR32(name##_cache, num)
# define SHOW_SBITS(name, gb, num)\ # define SHOW_SBITS(name, gb, num) NEG_SSR32(name##_cache, num)
NEG_SSR32(name##_cache, num)
# endif # endif
# define GET_CACHE(name, gb)\ # define GET_CACHE(name, gb) ((uint32_t)name##_cache)
((uint32_t)name##_cache)
static inline int get_bits_count(const GetBitContext *s){ static inline int get_bits_count(const GetBitContext *s){
return s->index; return s->index;
@ -213,12 +203,10 @@ static inline void skip_bits_long(GetBitContext *s, int n){
#if ARCH_X86 #if ARCH_X86
# define SKIP_CACHE(name, gb, num) \ # define SKIP_CACHE(name, gb, num) \
__asm__(\ __asm__("shldl %2, %1, %0 \n\t" \
"shldl %2, %1, %0 \n\t"\
"shll %2, %1 \n\t" \ "shll %2, %1 \n\t" \
: "+r" (name##_cache0), "+r" (name##_cache1) \ : "+r" (name##_cache0), "+r" (name##_cache1) \
: "Ic" ((uint8_t)(num))\ : "Ic" ((uint8_t)(num)))
)
#else #else
# define SKIP_CACHE(name, gb, num) do { \ # define SKIP_CACHE(name, gb, num) do { \
name##_cache0 <<= (num); \ name##_cache0 <<= (num); \
@ -227,11 +215,9 @@ static inline void skip_bits_long(GetBitContext *s, int n){
} while (0) } while (0)
#endif #endif
# define SKIP_COUNTER(name, gb, num)\ # define SKIP_COUNTER(name, gb, num) name##_bit_count += (num)
name##_bit_count += (num)
# define SKIP_BITS(name, gb, num)\ # define SKIP_BITS(name, gb, num) do { \
do {\
SKIP_CACHE(name, gb, num); \ SKIP_CACHE(name, gb, num); \
SKIP_COUNTER(name, gb, num); \ SKIP_COUNTER(name, gb, num); \
} while (0) } while (0)
@ -239,14 +225,11 @@ static inline void skip_bits_long(GetBitContext *s, int n){
# define LAST_SKIP_BITS(name, gb, num) SKIP_BITS(name, gb, num) # 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 LAST_SKIP_CACHE(name, gb, num) SKIP_CACHE(name, gb, num)
# define SHOW_UBITS(name, gb, num)\ # define SHOW_UBITS(name, gb, num) NEG_USR32(name##_cache0, num)
NEG_USR32(name##_cache0, num)
# define SHOW_SBITS(name, gb, num)\ # define SHOW_SBITS(name, gb, num) NEG_SSR32(name##_cache0, num)
NEG_SSR32(name##_cache0, num)
# define GET_CACHE(name, gb)\ # define GET_CACHE(name, gb) name##_cache0
(name##_cache0)
static inline int get_bits_count(const GetBitContext *s) { static inline int get_bits_count(const GetBitContext *s) {
return ((uint8_t*)s->buffer_ptr - s->buffer)*8 - 32 + s->bit_count; return ((uint8_t*)s->buffer_ptr - s->buffer)*8 - 32 + s->bit_count;
@ -277,7 +260,7 @@ static inline int get_xbits(GetBitContext *s, int n){
OPEN_READER(re, s); OPEN_READER(re, s);
UPDATE_CACHE(re, s); UPDATE_CACHE(re, s);
cache = GET_CACHE(re, s); cache = GET_CACHE(re, s);
sign=(~cache)>>31; sign = ~cache >> 31;
LAST_SKIP_BITS(re, s, n); LAST_SKIP_BITS(re, s, n);
CLOSE_READER(re, s); CLOSE_READER(re, s);
return (NEG_USR32(sign ^ cache, n) ^ sign) - sign; return (NEG_USR32(sign ^ cache, n) ^ sign) - sign;
@ -314,7 +297,6 @@ static inline unsigned int show_bits(GetBitContext *s, int n){
OPEN_READER(re, s); OPEN_READER(re, s);
UPDATE_CACHE(re, s); UPDATE_CACHE(re, s);
tmp = SHOW_UBITS(re, s, n); tmp = SHOW_UBITS(re, s, n);
// CLOSE_READER(re, s)
return tmp; return tmp;
} }
@ -331,10 +313,10 @@ static inline unsigned int get_bits1(GetBitContext *s){
unsigned int index = s->index; unsigned int index = s->index;
uint8_t result = s->buffer[index>>3]; uint8_t result = s->buffer[index>>3];
#ifdef ALT_BITSTREAM_READER_LE #ifdef ALT_BITSTREAM_READER_LE
result>>= (index&0x07); result >>= index & 7;
result &= 1; result &= 1;
#else #else
result<<= (index&0x07); result <<= index & 7;
result >>= 8 - 1; result >>= 8 - 1;
#endif #endif
index++; index++;
@ -421,7 +403,7 @@ static inline void init_get_bits(GetBitContext *s,
#ifdef ALT_BITSTREAM_READER #ifdef ALT_BITSTREAM_READER
s->index = 0; s->index = 0;
#elif defined A32_BITSTREAM_READER #elif defined A32_BITSTREAM_READER
s->buffer_ptr = (uint32_t*)((intptr_t)buffer&(~3)); s->buffer_ptr = (uint32_t*)((intptr_t)buffer & ~3);
s->bit_count = 32 + 8*((intptr_t)buffer & 3); s->bit_count = 32 + 8*((intptr_t)buffer & 3);
skip_bits_long(s, 0); skip_bits_long(s, 0);
#endif #endif
@ -429,7 +411,7 @@ static inline void init_get_bits(GetBitContext *s,
static inline void align_get_bits(GetBitContext *s) static inline void align_get_bits(GetBitContext *s)
{ {
int n= (-get_bits_count(s)) & 7; int n = -get_bits_count(s) & 7;
if (n) skip_bits(s, n); if (n) skip_bits(s, n);
} }
@ -451,8 +433,7 @@ int init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
#define INIT_VLC_USE_NEW_STATIC 4 #define INIT_VLC_USE_NEW_STATIC 4
void free_vlc(VLC *vlc); void free_vlc(VLC *vlc);
#define INIT_VLC_STATIC(vlc, bits, a,b,c,d,e,f,g, static_size)\ #define INIT_VLC_STATIC(vlc, bits, a,b,c,d,e,f,g, static_size) do { \
do {\
static VLC_TYPE table[static_size][2]; \ static VLC_TYPE table[static_size][2]; \
(vlc)->table = table; \ (vlc)->table = table; \
(vlc)->table_allocated = static_size; \ (vlc)->table_allocated = static_size; \
@ -466,8 +447,7 @@ do {\
* If the vlc code is invalid and max_depth>1, then the number of bits removed * If the vlc code is invalid and max_depth>1, then the number of bits removed
* is undefined. * is undefined.
*/ */
#define GET_VLC(code, name, gb, table, bits, max_depth)\ #define GET_VLC(code, name, gb, table, bits, max_depth) do { \
do {\
int n, nb_bits; \ int n, nb_bits; \
unsigned int index; \ unsigned int index; \
\ \
@ -498,8 +478,7 @@ do {\
SKIP_BITS(name, gb, n); \ SKIP_BITS(name, gb, n); \
} while (0) } while (0)
#define GET_RL_VLC(level, run, name, gb, table, bits, max_depth, need_update)\ #define GET_RL_VLC(level, run, name, gb, table, bits, max_depth, need_update) do { \
do {\
int n, nb_bits; \ int n, nb_bits; \
unsigned int index; \ unsigned int index; \
\ \
@ -559,14 +538,18 @@ static inline void print_bin(int bits, int n){
av_log(NULL, AV_LOG_DEBUG, " "); 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, char *file,
const char *func, int line){
int r = get_bits(s, n); int r = get_bits(s, n);
print_bin(r, 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); 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);
return r; 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){ 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 show = show_bits(s, 24); int show = show_bits(s, 24);
int pos = get_bits_count(s); int pos = get_bits_count(s);
int r = get_vlc2(s, table, bits, max_depth); int r = get_vlc2(s, table, bits, max_depth);
@ -575,15 +558,18 @@ static inline int get_vlc_trace(GetBitContext *s, VLC_TYPE (*table)[2], int bits
print_bin(bits2, 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); 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; 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, char *file,
const char *func, int line){
int show = show_bits(s, n); int show = show_bits(s, n);
int r = get_xbits(s, n); int r = get_xbits(s, n);
print_bin(show, 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); 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);
return r; return r;
} }

Write Preview
Loading…
Cancel
Save