RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sanitise get_bits macros, part 2 

These whitespace changes improve the readability of the get_bits
macros.

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard 2011-01-23 01:56:27 +00:00
parent bf5f9b528b
commit fb5c841d5f
1 changed files with 180 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
libavcodec/get_bits.h
View File

@ -129,29 +129,24 @@ for examples see get_bits, show_bits, skip_bits, get_vlc
unsigned int name##_index = (gb)->index; \
int name##_cache = 0
# 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)
# define SKIP_CACHE(name, gb, num)\
name##_cache >>= (num)
# define SKIP_CACHE(name, gb, num) name##_cache >>= (num)
# 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 SKIP_CACHE(name, gb, num) name##_cache <<= (num)
# endif
// FIXME name?
# define SKIP_COUNTER(name, gb, num)\
name##_index += (num)
# define SKIP_COUNTER(name, gb, num) name##_index += (num)
# 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)
@ -160,21 +155,16 @@ for examples see get_bits, show_bits, skip_bits, get_vlc
# define LAST_SKIP_CACHE(name, gb, num)
# ifdef ALT_BITSTREAM_READER_LE
# define SHOW_UBITS(name, gb, num)\
zero_extend(name##_cache, num)
# define SHOW_UBITS(name, gb, num) zero_extend(name##_cache, num)
# define SHOW_SBITS(name, gb, num)\
sign_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_UBITS(name, gb, num) NEG_USR32(name##_cache, num)
# define SHOW_SBITS(name, gb, num)\
NEG_SSR32(name##_cache, num)
# define SHOW_SBITS(name, gb, num) NEG_SSR32(name##_cache, num)
# endif
# define GET_CACHE(name, gb)\
((uint32_t)name##_cache)
# define GET_CACHE(name, gb) ((uint32_t)name##_cache)
static inline int get_bits_count(const GetBitContext *s){
return s->index;
@ -213,12 +203,10 @@ static inline void skip_bits_long(GetBitContext *s, int n){
#if ARCH_X86
# define SKIP_CACHE(name, gb, num) \
__asm__(\
"shldl %2, %1, %0 \n\t"\
__asm__("shldl %2, %1, %0 \n\t" \
"shll %2, %1 \n\t" \
: "+r" (name##_cache0), "+r" (name##_cache1) \
: "Ic" ((uint8_t)(num))\
)
: "Ic" ((uint8_t)(num)))
#else
# define SKIP_CACHE(name, gb, num) do { \
name##_cache0 <<= (num); \
@ -227,11 +215,9 @@ static inline void skip_bits_long(GetBitContext *s, int n){
} while (0)
#endif
# define SKIP_COUNTER(name, gb, num)\
name##_bit_count += (num)
# define SKIP_COUNTER(name, gb, num) name##_bit_count += (num)
# 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)
@ -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_CACHE(name, gb, num) SKIP_CACHE(name, gb, num)
# define SHOW_UBITS(name, gb, num)\
NEG_USR32(name##_cache0, num)
# define SHOW_UBITS(name, gb, num) NEG_USR32(name##_cache0, num)
# define SHOW_SBITS(name, gb, num)\
NEG_SSR32(name##_cache0, num)
# define SHOW_SBITS(name, gb, num) NEG_SSR32(name##_cache0, num)
# define GET_CACHE(name, gb)\
(name##_cache0)
# define GET_CACHE(name, gb) name##_cache0
static inline int get_bits_count(const GetBitContext *s) {
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);
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;
@ -314,7 +297,6 @@ static inline unsigned int show_bits(GetBitContext *s, int n){
OPEN_READER(re, s);
UPDATE_CACHE(re, s);
tmp = SHOW_UBITS(re, s, n);
// CLOSE_READER(re, s)
return tmp;
}
@ -331,10 +313,10 @@ 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
result>>= (index&0x07);
result >>= index & 7;
result &= 1;
#else
result<<= (index&0x07);
result <<= index & 7;
result >>= 8 - 1;
#endif
index++;
@ -421,7 +403,7 @@ static inline void init_get_bits(GetBitContext *s,
#ifdef ALT_BITSTREAM_READER
s->index = 0;
#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);
skip_bits_long(s, 0);
#endif
@ -429,7 +411,7 @@ static inline void init_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);
}
@ -451,8 +433,7 @@ int init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
#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 {\
#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; \
@ -466,8 +447,7 @@ do {\
* 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; \
\
@ -498,8 +478,7 @@ do {\
SKIP_BITS(name, gb, n); \
} while (0)
#define GET_RL_VLC(level, run, name, gb, table, bits, max_depth, need_update)\
do {\
#define GET_RL_VLC(level, run, name, gb, table, bits, max_depth, need_update) do { \
int n, nb_bits; \
unsigned int index; \
\
@ -559,14 +538,18 @@ static inline void print_bin(int bits, int n){
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);
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;
}
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 pos = get_bits_count(s);
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);
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;
}
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 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);
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;
}