Skip to content
Snippets Groups Projects
Commit f776899a authored by Luca Barbato's avatar Luca Barbato
Browse files

bitstream: K&R formatting cosmetics

parent 9e80eda2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 74 additions and 70 deletions
libavcodec/bitstream.c
+ 74
− 70
View file @ f776899a
...@@ -44,81 +44,84 @@ const uint8_t ff_log2_run[41]={ ...@@ -44,81 +44,84 @@ const uint8_t ff_log2_run[41]={
void avpriv_align_put_bits(PutBitContext *s) void avpriv_align_put_bits(PutBitContext *s)
{ {
put_bits(s,s->bit_left & 7,0); put_bits(s, s->bit_left & 7, 0);
} }
void avpriv_put_string(PutBitContext *pb, const char *string, int terminate_string) void avpriv_put_string(PutBitContext *pb, const char *string,
int terminate_string)
{ {
while(*string){ while (*string) {
put_bits(pb, 8, *string); put_bits(pb, 8, *string);
string++; string++;
} }
if(terminate_string) if (terminate_string)
put_bits(pb, 8, 0); put_bits(pb, 8, 0);
} }
void avpriv_copy_bits(PutBitContext *pb, const uint8_t *src, int length) void avpriv_copy_bits(PutBitContext *pb, const uint8_t *src, int length)
{ {
int words= length>>4; int words = length >> 4;
int bits= length&15; int bits = length & 15;
int i; int i;
if(length==0) return; if (length == 0)
return;
if(CONFIG_SMALL || words < 16 || put_bits_count(pb)&7){ if (CONFIG_SMALL || words < 16 || put_bits_count(pb) & 7) {
for(i=0; i<words; i++) put_bits(pb, 16, AV_RB16(src + 2*i)); for (i = 0; i < words; i++)
}else{ put_bits(pb, 16, AV_RB16(src + 2 * i));
for(i=0; put_bits_count(pb)&31; i++) } else {
for (i = 0; put_bits_count(pb) & 31; i++)
put_bits(pb, 8, src[i]); put_bits(pb, 8, src[i]);
flush_put_bits(pb); flush_put_bits(pb);
memcpy(put_bits_ptr(pb), src+i, 2*words-i); memcpy(put_bits_ptr(pb), src + i, 2 * words - i);
skip_put_bytes(pb, 2*words-i); skip_put_bytes(pb, 2 * words - i);
} }
put_bits(pb, bits, AV_RB16(src + 2*words)>>(16-bits)); put_bits(pb, bits, AV_RB16(src + 2 * words) >> (16 - bits));
} }
/* VLC decoding */ /* VLC decoding */
#define GET_DATA(v, table, i, wrap, size) \ #define GET_DATA(v, table, i, wrap, size) \
{\ { \
const uint8_t *ptr = (const uint8_t *)table + i * wrap;\ const uint8_t *ptr = (const uint8_t *)table + i * wrap; \
switch(size) {\ switch(size) { \
case 1:\ case 1: \
v = *(const uint8_t *)ptr;\ v = *(const uint8_t *)ptr; \
break;\ break; \
case 2:\ case 2: \
v = *(const uint16_t *)ptr;\ v = *(const uint16_t *)ptr; \
break;\ break; \
default:\ default: \
v = *(const uint32_t *)ptr;\ v = *(const uint32_t *)ptr; \
break;\ break; \
}\ } \
} }
static int alloc_table(VLC *vlc, int size, int use_static) static int alloc_table(VLC *vlc, int size, int use_static)
{ {
int index; int index = vlc->table_size;
index = vlc->table_size;
vlc->table_size += size; vlc->table_size += size;
if (vlc->table_size > vlc->table_allocated) { if (vlc->table_size > vlc->table_allocated) {
if(use_static) if (use_static)
abort(); // cannot do anything, init_vlc() is used with too little memory abort(); // cannot do anything, init_vlc() is used with too little memory
vlc->table_allocated += (1 << vlc->bits); vlc->table_allocated += (1 << vlc->bits);
vlc->table = av_realloc(vlc->table, vlc->table = av_realloc(vlc->table, sizeof(VLC_TYPE) * 2 * vlc->table_allocated);
sizeof(VLC_TYPE) * 2 * vlc->table_allocated);
if (!vlc->table) if (!vlc->table)
return -1; return -1;
} }
return index; return index;
} }
static av_always_inline uint32_t bitswap_32(uint32_t x) { static av_always_inline uint32_t bitswap_32(uint32_t x)
return (uint32_t)ff_reverse[x&0xFF]<<24 {
| (uint32_t)ff_reverse[(x>>8)&0xFF]<<16 return (uint32_t)ff_reverse[ x & 0xFF] << 24 |
| (uint32_t)ff_reverse[(x>>16)&0xFF]<<8 (uint32_t)ff_reverse[(x >> 8) & 0xFF] << 16 |
| (uint32_t)ff_reverse[x>>24]; (uint32_t)ff_reverse[(x >> 16) & 0xFF] << 8 |
(uint32_t)ff_reverse[ x >> 24];
} }
typedef struct { typedef struct {
...@@ -131,10 +134,9 @@ typedef struct { ...@@ -131,10 +134,9 @@ typedef struct {
static int compare_vlcspec(const void *a, const void *b) static int compare_vlcspec(const void *a, const void *b)
{ {
const VLCcode *sa=a, *sb=b; const VLCcode *sa = a, *sb = b;
return (sa->code >> 1) - (sb->code >> 1); return (sa->code >> 1) - (sb->code >> 1);
} }
/** /**
* Build VLC decoding tables suitable for use with get_vlc(). * Build VLC decoding tables suitable for use with get_vlc().
* *
...@@ -171,8 +173,8 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, ...@@ -171,8 +173,8 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes,
/* first pass: map codes and compute auxiliary table sizes */ /* first pass: map codes and compute auxiliary table sizes */
for (i = 0; i < nb_codes; i++) { for (i = 0; i < nb_codes; i++) {
n = codes[i].bits; n = codes[i].bits;
code = codes[i].code; code = codes[i].code;
symbol = codes[i].symbol; symbol = codes[i].symbol;
av_dlog(NULL, "i=%d n=%d code=0x%x\n", i, n, code); av_dlog(NULL, "i=%d n=%d code=0x%x\n", i, n, code);
if (n <= table_nb_bits) { if (n <= table_nb_bits) {
...@@ -257,48 +259,48 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, ...@@ -257,48 +259,48 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes,
with av_free_static(), 0 if ff_free_vlc() will be used. with av_free_static(), 0 if ff_free_vlc() will be used.
*/ */
int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
const void *bits, int bits_wrap, int bits_size, const void *bits, int bits_wrap, int bits_size,
const void *codes, int codes_wrap, int codes_size, const void *codes, int codes_wrap, int codes_size,
const void *symbols, int symbols_wrap, int symbols_size, const void *symbols, int symbols_wrap, int symbols_size,
int flags) int flags)
{ {
VLCcode *buf; VLCcode *buf;
int i, j, ret; int i, j, ret;
vlc->bits = nb_bits; vlc->bits = nb_bits;
if(flags & INIT_VLC_USE_NEW_STATIC){ if (flags & INIT_VLC_USE_NEW_STATIC) {
if(vlc->table_size && vlc->table_size == vlc->table_allocated){ if (vlc->table_size && vlc->table_size == vlc->table_allocated) {
return 0; return 0;
}else if(vlc->table_size){ } else if (vlc->table_size) {
abort(); // fatal error, we are called on a partially initialized table abort(); // fatal error, we are called on a partially initialized table
} }
}else { } else {
vlc->table = NULL; vlc->table = NULL;
vlc->table_allocated = 0; vlc->table_allocated = 0;
vlc->table_size = 0; vlc->table_size = 0;
} }
av_dlog(NULL, "build table nb_codes=%d\n", nb_codes); av_dlog(NULL, "build table nb_codes=%d\n", nb_codes);
buf = av_malloc((nb_codes+1)*sizeof(VLCcode)); buf = av_malloc((nb_codes + 1) * sizeof(VLCcode));
assert(symbols_size <= 2 || !symbols); assert(symbols_size <= 2 || !symbols);
j = 0; j = 0;
#define COPY(condition)\ #define COPY(condition) \
for (i = 0; i < nb_codes; i++) {\ for (i = 0; i < nb_codes; i++) { \
GET_DATA(buf[j].bits, bits, i, bits_wrap, bits_size);\ GET_DATA(buf[j].bits, bits, i, bits_wrap, bits_size); \
if (!(condition))\ if (!(condition)) \
continue;\ continue; \
GET_DATA(buf[j].code, codes, i, codes_wrap, codes_size);\ GET_DATA(buf[j].code, codes, i, codes_wrap, codes_size); \
if (flags & INIT_VLC_LE)\ if (flags & INIT_VLC_LE) \
buf[j].code = bitswap_32(buf[j].code);\ buf[j].code = bitswap_32(buf[j].code); \
else\ else \
buf[j].code <<= 32 - buf[j].bits;\ buf[j].code <<= 32 - buf[j].bits; \
if (symbols)\ if (symbols) \
GET_DATA(buf[j].symbol, symbols, i, symbols_wrap, symbols_size)\ GET_DATA(buf[j].symbol, symbols, i, symbols_wrap, symbols_size) \
else\ else \
buf[j].symbol = i;\ buf[j].symbol = i; \
j++;\ j++; \
} }
COPY(buf[j].bits > nb_bits); COPY(buf[j].bits > nb_bits);
// qsort is the slowest part of init_vlc, and could probably be improved or avoided // qsort is the slowest part of init_vlc, and could probably be improved or avoided
...@@ -313,8 +315,10 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, ...@@ -313,8 +315,10 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
av_freep(&vlc->table); av_freep(&vlc->table);
return -1; return -1;
} }
if((flags & INIT_VLC_USE_NEW_STATIC) && vlc->table_size != vlc->table_allocated) if ((flags & INIT_VLC_USE_NEW_STATIC) &&
av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); vlc->table_size != vlc->table_allocated)
av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n",
vlc->table_size, vlc->table_allocated);
return 0; return 0;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment