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

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  golomb: K&R formatting cosmetics

Conflicts:
	libavcodec/golomb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/41/head
Michael Niedermayer 11 years ago
parent 4c18c31438 2c993e8b5e
commit 02a31f6a74
1 changed files with 177 additions and 135 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. 142
      libavcodec/golomb.h

142
libavcodec/golomb.h
Unescape View File

@ -31,6 +31,7 @@
#define AVCODEC_GOLOMB_H #define AVCODEC_GOLOMB_H
#include <stdint.h> #include <stdint.h>
#include "get_bits.h" #include "get_bits.h"
#include "put_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 int8_t ff_interleaved_se_golomb_vlc_code[256];
extern const uint8_t ff_interleaved_dirac_golomb_vlc_code[256]; extern const uint8_t ff_interleaved_dirac_golomb_vlc_code[256];
/** /**
* read unsigned exp golomb code. * read unsigned exp golomb code.
*/ */
static inline int get_ue_golomb(GetBitContext *gb){ static inline int get_ue_golomb(GetBitContext *gb)
{
unsigned int buf; unsigned int buf;
int log; int log;
@ -97,7 +98,8 @@ static inline unsigned get_ue_golomb_long(GetBitContext *gb)
* read unsigned exp golomb code, constraint to a max of 31. * read unsigned exp golomb code, constraint to a max of 31.
* the return value is undefined if the stored value exceeds 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; unsigned int buf;
OPEN_READER(re, gb); OPEN_READER(re, gb);
@ -130,7 +132,8 @@ static inline unsigned svq3_get_ue_golomb(GetBitContext *gb)
do { do {
buf >>= 32 - 8; 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) { if (ff_interleaved_golomb_vlc_len[buf] != 9) {
ret <<= (ff_interleaved_golomb_vlc_len[buf] - 1) >> 1; ret <<= (ff_interleaved_golomb_vlc_len[buf] - 1) >> 1;
@ -150,29 +153,36 @@ static inline unsigned svq3_get_ue_golomb(GetBitContext *gb)
/** /**
* read unsigned truncated exp golomb code. * 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)
{
av_assert2(range >= 1); av_assert2(range >= 1);
if(range==1) return 0; if (range == 1)
else if(range==2) return get_bits1(gb)^1; return 0;
else return get_ue_golomb(gb); else if (range == 2)
return get_bits1(gb) ^ 1;
else
return get_ue_golomb(gb);
} }
/** /**
* read unsigned truncated exp golomb code. * 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)
{
av_assert2(range >= 1); av_assert2(range >= 1);
if(range==2) return get_bits1(gb)^1; if (range == 2)
else return get_ue_golomb(gb); return get_bits1(gb) ^ 1;
else
return get_ue_golomb(gb);
} }
/** /**
* read signed exp golomb code. * read signed exp golomb code.
*/ */
static inline int get_se_golomb(GetBitContext *gb){ static inline int get_se_golomb(GetBitContext *gb)
{
unsigned int buf; unsigned int buf;
int log; int log;
@ -197,14 +207,17 @@ static inline int get_se_golomb(GetBitContext *gb){
LAST_SKIP_BITS(re, gb, 32 - log); LAST_SKIP_BITS(re, gb, 32 - log);
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
if(buf&1) buf= -(buf>>1); if (buf & 1)
else buf= (buf>>1); buf = -(buf >> 1);
else
buf = (buf >> 1);
return buf; return buf;
} }
} }
static inline int svq3_get_se_golomb(GetBitContext *gb){ static inline int svq3_get_se_golomb(GetBitContext *gb)
{
unsigned int buf; unsigned int buf;
int log; int log;
@ -226,9 +239,8 @@ static inline int svq3_get_se_golomb(GetBitContext *gb){
if ((buf & 0xAAAAAAAA) == 0) if ((buf & 0xAAAAAAAA) == 0)
return INVALID_VLC; 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); buf = (buf << 2) - ((buf << log) >> (log - 1)) + (buf >> 30);
}
LAST_SKIP_BITS(re, gb, 63 - 2 * log - 8); LAST_SKIP_BITS(re, gb, 63 - 2 * log - 8);
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
@ -237,7 +249,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 buf;
uint32_t ret; uint32_t ret;
@ -258,7 +271,9 @@ static inline int dirac_get_se_golomb(GetBitContext *gb){
/** /**
* read unsigned golomb rice code (ffv1). * 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; unsigned int buf;
int log; int log;
@ -291,7 +306,9 @@ static inline int get_ur_golomb(GetBitContext *gb, int k, int limit, int esc_len
/** /**
* read unsigned golomb rice code (jpegls). * 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; unsigned int buf;
int log; int log;
@ -301,7 +318,8 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int
log = av_log2(buf); 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 >>= log - k;
buf += (30 - log) << k; buf += (30 - log) << k;
LAST_SKIP_BITS(re, gb, 32 + k - log); LAST_SKIP_BITS(re, gb, 32 + k - log);
@ -342,12 +360,16 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int
/** /**
* read signed golomb rice code (ffv1). * 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); int v = get_ur_golomb(gb, k, limit, esc_len);
v++; v++;
if (v&1) return v>>1; if (v & 1)
else return -(v>>1); return v >> 1;
else
return -(v >> 1);
// return (v>>1) ^ -(v&1); // return (v>>1) ^ -(v&1);
} }
@ -355,7 +377,9 @@ static inline int get_sr_golomb(GetBitContext *gb, int k, int limit, int esc_len
/** /**
* read signed golomb rice code (flac). * 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); int v = get_ur_golomb_jpegls(gb, k, limit, esc_len);
return (v >> 1) ^ -(v & 1); return (v >> 1) ^ -(v & 1);
} }
@ -363,7 +387,8 @@ static inline int get_sr_golomb_flac(GetBitContext *gb, int k, int limit, int es
/** /**
* read unsigned golomb rice code (shorten). * 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); return get_ur_golomb_jpegls(gb, k, INT_MAX, 0);
} }
@ -379,8 +404,6 @@ static inline int get_sr_golomb_shorten(GetBitContext* gb, int k)
return uvar >> 1; return uvar >> 1;
} }
#ifdef TRACE #ifdef TRACE
static inline int get_ue(GetBitContext *s, const char *file, const char *func, static inline int get_ue(GetBitContext *s, const char *file, const char *func,
@ -394,7 +417,8 @@ static inline int get_ue(GetBitContext *s, const char *file, const char *func,
print_bin(bits, len); 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; return i;
} }
@ -410,12 +434,15 @@ static inline int get_se(GetBitContext *s, const char *file, const char *func,
print_bin(bits, len); 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; 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 show = show_bits(s, 24);
int pos = get_bits_count(s); int pos = get_bits_count(s);
int i = get_te0_golomb(s, r); int i = get_te0_golomb(s, r);
@ -424,7 +451,8 @@ static inline int get_te(GetBitContext *s, int r, char *file, const char *func,
print_bin(bits, len); 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; return i;
} }
@ -434,12 +462,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_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__) #define get_te0_golomb(a, r) get_te(a, r, __FILE__, __PRETTY_FUNCTION__, __LINE__)
#endif #endif /* TRACE */
/** /**
* write unsigned exp golomb code. * 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; int e;
av_assert2(i >= 0); av_assert2(i >= 0);
@ -454,7 +483,6 @@ static inline void set_ue_golomb(PutBitContext *pb, int i){
put_bits(pb, ff_ue_golomb_len[i], i + 1); put_bits(pb, ff_ue_golomb_len[i], i + 1);
else { else {
e = av_log2(i + 1); e = av_log2(i + 1);
put_bits(pb, 2 * e + 1, i + 1); put_bits(pb, 2 * e + 1, i + 1);
} }
} }
@ -462,24 +490,31 @@ static inline void set_ue_golomb(PutBitContext *pb, int i){
/** /**
* write truncated unsigned exp golomb code. * 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)
{
av_assert2(range >= 1); av_assert2(range >= 1);
av_assert2(i <= range); av_assert2(i <= range);
if(range==2) put_bits(pb, 1, i^1); if (range == 2)
else set_ue_golomb(pb, i); put_bits(pb, 1, i ^ 1);
else
set_ue_golomb(pb, i);
} }
/** /**
* write signed exp golomb code. 16 bits at most. * 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 0
if(i<=0) i= -2*i; if (i <= 0)
else i= 2*i-1; i = -2 * i;
else
i = 2 * i - 1;
#elif 1 #elif 1
i = 2 * i - 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 #else
i = 2 * i - 1; i = 2 * i - 1;
i ^= (i >> 31); i ^= (i >> 31);
@ -490,23 +525,26 @@ static inline void set_se_golomb(PutBitContext *pb, int i){
/** /**
* write unsigned golomb rice code (ffv1). * 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; int e;
av_assert2(i >= 0); av_assert2(i >= 0);
e = i >> k; e = i >> k;
if(e<limit){ if (e < limit)
put_bits(pb, e + k + 1, (1 << k) + (i & ((1 << k) - 1))); put_bits(pb, e + k + 1, (1 << k) + (i & ((1 << k) - 1)));
}else{ else
put_bits(pb, limit + esc_len, i - limit + 1); put_bits(pb, limit + esc_len, i - limit + 1);
} }
}
/** /**
* write unsigned golomb rice code (jpegls). * 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; int e;
av_assert2(i >= 0); av_assert2(i >= 0);
@ -533,7 +571,9 @@ static inline void set_ur_golomb_jpegls(PutBitContext *pb, int i, int k, int lim
/** /**
* write signed golomb rice code (ffv1). * 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; int v;
v = -2 * i - 1; v = -2 * i - 1;
@ -545,7 +585,9 @@ static inline void set_sr_golomb(PutBitContext *pb, int i, int k, int limit, int
/** /**
* write signed golomb rice code (flac). * 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; int v;
v = -2 * i - 1; v = -2 * i - 1;

Write Preview
Loading…
Cancel
Save