virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

golomb: K&R formatting cosmetics

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Vittorio Giovara
2013-10-22 13:12:49 +02:00
committed by Diego Biurrun
parent 1ce3ec24b3
commit 2c993e8b5e
1 changed files with 178 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
libavcodec/golomb.h
View File

@@ -31,6 +31,7 @@
#define AVCODEC_GOLOMB_H
#include <stdint.h>
#include "get_bits.h"
#include "put_bits.h"
@@ -46,11 +47,11 @@ extern const uint8_t ff_interleaved_ue_golomb_vlc_code[256];
extern const int8_t ff_interleaved_se_golomb_vlc_code[256];
extern const uint8_t ff_interleaved_dirac_golomb_vlc_code[256];
/**
* read unsigned exp golomb code.
*/
static inline int get_ue_golomb(GetBitContext *gb){
static inline int get_ue_golomb(GetBitContext *gb)
{
unsigned int buf;
int log;
@@ -93,7 +94,8 @@ static inline unsigned get_ue_golomb_long(GetBitContext *gb)
* read unsigned exp golomb code, constraint to a max of 31.
* the return value is undefined if the stored value exceeds 31.
*/
static inline int get_ue_golomb_31(GetBitContext *gb){
static inline int get_ue_golomb_31(GetBitContext *gb)
{
unsigned int buf;
OPEN_READER(re, gb);
@@ -126,7 +128,8 @@ static inline unsigned svq3_get_ue_golomb(GetBitContext *gb)
do {
buf >>= 32 - 8;
LAST_SKIP_BITS(re, gb, FFMIN(ff_interleaved_golomb_vlc_len[buf], 8));
LAST_SKIP_BITS(re, gb,
FFMIN(ff_interleaved_golomb_vlc_len[buf], 8));
if (ff_interleaved_golomb_vlc_len[buf] != 9) {
ret <<= (ff_interleaved_golomb_vlc_len[buf] - 1) >> 1;
@@ -146,29 +149,36 @@ static inline unsigned svq3_get_ue_golomb(GetBitContext *gb)
/**
* read unsigned truncated exp golomb code.
*/
static inline int get_te0_golomb(GetBitContext *gb, int range){
static inline int get_te0_golomb(GetBitContext *gb, int range)
{
assert(range >= 1);
if(range==1) return 0;
else if(range==2) return get_bits1(gb)^1;
else return get_ue_golomb(gb);
if (range == 1)
return 0;
else if (range == 2)
return get_bits1(gb) ^ 1;
else
return get_ue_golomb(gb);
}
/**
* read unsigned truncated exp golomb code.
*/
static inline int get_te_golomb(GetBitContext *gb, int range){
static inline int get_te_golomb(GetBitContext *gb, int range)
{
assert(range >= 1);
if(range==2) return get_bits1(gb)^1;
else return get_ue_golomb(gb);
if (range == 2)
return get_bits1(gb) ^ 1;
else
return get_ue_golomb(gb);
}
/**
* read signed exp golomb code.
*/
static inline int get_se_golomb(GetBitContext *gb){
static inline int get_se_golomb(GetBitContext *gb)
{
unsigned int buf;
int log;
@@ -189,14 +199,17 @@ static inline int get_se_golomb(GetBitContext *gb){
LAST_SKIP_BITS(re, gb, 32 - log);
CLOSE_READER(re, gb);
if(buf&1) buf= -(buf>>1);
else buf= (buf>>1);
if (buf & 1)
buf = -(buf >> 1);
else
buf = (buf >> 1);
return buf;
}
}
static inline int svq3_get_se_golomb(GetBitContext *gb){
static inline int svq3_get_se_golomb(GetBitContext *gb)
{
unsigned int buf;
int log;
@@ -218,9 +231,8 @@ static inline int svq3_get_se_golomb(GetBitContext *gb){
if ((buf & 0xAAAAAAAA) == 0)
return INVALID_VLC;
for(log=31; (buf & 0x80000000) == 0; log--){
for (log = 31; (buf & 0x80000000) == 0; log--)
buf = (buf << 2) - ((buf << log) >> (log - 1)) + (buf >> 30);
}
LAST_SKIP_BITS(re, gb, 63 - 2 * log - 8);
CLOSE_READER(re, gb);
@@ -229,7 +241,8 @@ static inline int svq3_get_se_golomb(GetBitContext *gb){
}
}
static inline int dirac_get_se_golomb(GetBitContext *gb){
static inline int dirac_get_se_golomb(GetBitContext *gb)
{
uint32_t buf;
uint32_t ret;
@@ -250,7 +263,9 @@ static inline int dirac_get_se_golomb(GetBitContext *gb){
/**
* read unsigned golomb rice code (ffv1).
*/
static inline int get_ur_golomb(GetBitContext *gb, int k, int limit, int esc_len){
static inline int get_ur_golomb(GetBitContext *gb, int k, int limit,
int esc_len)
{
unsigned int buf;
int log;
@@ -283,7 +298,9 @@ static inline int get_ur_golomb(GetBitContext *gb, int k, int limit, int esc_len
/**
* read unsigned golomb rice code (jpegls).
*/
static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int esc_len){
static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit,
int esc_len)
{
unsigned int buf;
int log;
@@ -293,7 +310,8 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int
log = av_log2(buf);
if(log - k >= 32-MIN_CACHE_BITS+(MIN_CACHE_BITS==32) && 32-log < limit){
if (log - k >= 32 - MIN_CACHE_BITS + (MIN_CACHE_BITS == 32) &&
32 - log < limit) {
buf >>= log - k;
buf += (30 - log) << k;
LAST_SKIP_BITS(re, gb, 32 + k - log);
@@ -332,12 +350,16 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int
/**
* read signed golomb rice code (ffv1).
*/
static inline int get_sr_golomb(GetBitContext *gb, int k, int limit, int esc_len){
static inline int get_sr_golomb(GetBitContext *gb, int k, int limit,
int esc_len)
{
int v = get_ur_golomb(gb, k, limit, esc_len);
v++;
if (v&1) return v>>1;
else return -(v>>1);
if (v & 1)
return v >> 1;
else
return -(v >> 1);
// return (v>>1) ^ -(v&1);
}
@@ -345,7 +367,9 @@ static inline int get_sr_golomb(GetBitContext *gb, int k, int limit, int esc_len
/**
* read signed golomb rice code (flac).
*/
static inline int get_sr_golomb_flac(GetBitContext *gb, int k, int limit, int esc_len){
static inline int get_sr_golomb_flac(GetBitContext *gb, int k, int limit,
int esc_len)
{
int v = get_ur_golomb_jpegls(gb, k, limit, esc_len);
return (v >> 1) ^ -(v & 1);
}
@@ -353,7 +377,8 @@ static inline int get_sr_golomb_flac(GetBitContext *gb, int k, int limit, int es
/**
* read unsigned golomb rice code (shorten).
*/
static inline unsigned int get_ur_golomb_shorten(GetBitContext *gb, int k){
static inline unsigned int get_ur_golomb_shorten(GetBitContext *gb, int k)
{
return get_ur_golomb_jpegls(gb, k, INT_MAX, 0);
}
@@ -369,8 +394,6 @@ static inline int get_sr_golomb_shorten(GetBitContext* gb, int k)
return uvar >> 1;
}
#ifdef TRACE
static inline int get_ue(GetBitContext *s, const char *file, const char *func,
@@ -384,7 +407,8 @@ static inline int get_ue(GetBitContext *s, const char *file, const char *func,
print_bin(bits, len);
av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d ue @%5d in %s %s:%d\n", bits, len, i, pos, file, func, line);
av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d ue @%5d in %s %s:%d\n",
bits, len, i, pos, file, func, line);
return i;
}
@@ -400,12 +424,15 @@ static inline int get_se(GetBitContext *s, const char *file, const char *func,
print_bin(bits, len);
av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d se @%5d in %s %s:%d\n", bits, len, i, pos, file, func, line);
av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d se @%5d in %s %s:%d\n",
bits, len, i, pos, file, func, line);
return i;
}
static inline int get_te(GetBitContext *s, int r, char *file, const char *func, int line){
static inline int get_te(GetBitContext *s, int r, char *file, const char *func,
int line)
{
int show = show_bits(s, 24);
int pos = get_bits_count(s);
int i = get_te0_golomb(s, r);
@@ -414,7 +441,8 @@ static inline int get_te(GetBitContext *s, int r, char *file, const char *func,
print_bin(bits, len);
av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d te @%5d in %s %s:%d\n", bits, len, i, pos, file, func, line);
av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d te @%5d in %s %s:%d\n",
bits, len, i, pos, file, func, line);
return i;
}
@@ -424,12 +452,13 @@ static inline int get_te(GetBitContext *s, int r, char *file, const char *func,
#define get_te_golomb(a, r) get_te(a, r, __FILE__, __PRETTY_FUNCTION__, __LINE__)
#define get_te0_golomb(a, r) get_te(a, r, __FILE__, __PRETTY_FUNCTION__, __LINE__)
#endif
#endif /* TRACE */
/**
* write unsigned exp golomb code.
*/
static inline void set_ue_golomb(PutBitContext *pb, int i){
static inline void set_ue_golomb(PutBitContext *pb, int i)
{
int e;
assert(i >= 0);
@@ -444,7 +473,6 @@ static inline void set_ue_golomb(PutBitContext *pb, int i){
put_bits(pb, ff_ue_golomb_len[i], i + 1);
else {
e = av_log2(i + 1);
put_bits(pb, 2 * e + 1, i + 1);
}
}
@@ -452,24 +480,31 @@ static inline void set_ue_golomb(PutBitContext *pb, int i){
/**
* write truncated unsigned exp golomb code.
*/
static inline void set_te_golomb(PutBitContext *pb, int i, int range){
static inline void set_te_golomb(PutBitContext *pb, int i, int range)
{
assert(range >= 1);
assert(i <= range);
if(range==2) put_bits(pb, 1, i^1);
else set_ue_golomb(pb, i);
if (range == 2)
put_bits(pb, 1, i ^ 1);
else
set_ue_golomb(pb, i);
}
/**
* write signed exp golomb code. 16 bits at most.
*/
static inline void set_se_golomb(PutBitContext *pb, int i){
static inline void set_se_golomb(PutBitContext *pb, int i)
{
#if 0
if(i<=0) i= -2*i;
else i= 2*i-1;
if (i <= 0)
i = -2 * i;
else
i = 2 * i - 1;
#elif 1
i = 2 * i - 1;
if(i<0) i^= -1; //FIXME check if gcc does the right thing
if (i < 0)
i ^= -1; //FIXME check if gcc does the right thing
#else
i = 2 * i - 1;
i ^= (i >> 31);
@@ -480,23 +515,26 @@ static inline void set_se_golomb(PutBitContext *pb, int i){
/**
* write unsigned golomb rice code (ffv1).
*/
static inline void set_ur_golomb(PutBitContext *pb, int i, int k, int limit, int esc_len){
static inline void set_ur_golomb(PutBitContext *pb, int i, int k, int limit,
int esc_len)
{
int e;
assert(i >= 0);
e = i >> k;
if(e<limit){
if (e < limit)
put_bits(pb, e + k + 1, (1 << k) + (i & ((1 << k) - 1)));
}else{
else
put_bits(pb, limit + esc_len, i - limit + 1);
}
}
/**
* write unsigned golomb rice code (jpegls).
*/
static inline void set_ur_golomb_jpegls(PutBitContext *pb, int i, int k, int limit, int esc_len){
static inline void set_ur_golomb_jpegls(PutBitContext *pb, int i, int k,
int limit, int esc_len)
{
int e;
assert(i >= 0);
@@ -523,7 +561,9 @@ static inline void set_ur_golomb_jpegls(PutBitContext *pb, int i, int k, int lim
/**
* write signed golomb rice code (ffv1).
*/
static inline void set_sr_golomb(PutBitContext *pb, int i, int k, int limit, int esc_len){
static inline void set_sr_golomb(PutBitContext *pb, int i, int k, int limit,
int esc_len)
{
int v;
v = -2 * i - 1;
@@ -535,7 +575,9 @@ static inline void set_sr_golomb(PutBitContext *pb, int i, int k, int limit, int
/**
* write signed golomb rice code (flac).
*/
static inline void set_sr_golomb_flac(PutBitContext *pb, int i, int k, int limit, int esc_len){
static inline void set_sr_golomb_flac(PutBitContext *pb, int i, int k,
int limit, int esc_len)
{
int v;
v = -2 * i - 1;