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

Merge remote-tracking branch 'qatar/master' 

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

Conflicts:
	libavcodec/golomb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-23 19:45:07 +02:00
parent 4c18c31438 2c993e8b5e
commit 02a31f6a74
1 changed files with 177 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

312
libavcodec/golomb.h
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,33 +47,33 @@ 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;
OPEN_READER(re, gb); OPEN_READER(re, gb);
UPDATE_CACHE(re, gb); UPDATE_CACHE(re, gb);
buf=GET_CACHE(re, gb); buf = GET_CACHE(re, gb);
if(buf >= (1<<27)){ if (buf >= (1 << 27)) {
buf >>= 32 - 9; buf >>= 32 - 9;
LAST_SKIP_BITS(re, gb, ff_golomb_vlc_len[buf]); LAST_SKIP_BITS(re, gb, ff_golomb_vlc_len[buf]);
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
return ff_ue_golomb_vlc_code[buf]; return ff_ue_golomb_vlc_code[buf];
}else{ } else {
log= 2*av_log2(buf) - 31; log = 2 * av_log2(buf) - 31;
LAST_SKIP_BITS(re, gb, 32 - log); LAST_SKIP_BITS(re, gb, 32 - log);
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
if (CONFIG_FTRAPV && log < 0) { if (CONFIG_FTRAPV && log < 0) {
av_log(0, AV_LOG_ERROR, "Invalid UE golomb code\n"); av_log(0, AV_LOG_ERROR, "Invalid UE golomb code\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
buf>>= log; buf >>= log;
buf--; buf--;
return buf; return buf;
@ -93,16 +94,17 @@ static inline unsigned get_ue_golomb_long(GetBitContext *gb)
return get_bits_long(gb, log + 1) - 1; return get_bits_long(gb, log + 1) - 1;
} }
/** /**
* 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);
UPDATE_CACHE(re, gb); UPDATE_CACHE(re, gb);
buf=GET_CACHE(re, gb); buf = GET_CACHE(re, gb);
buf >>= 32 - 9; buf >>= 32 - 9;
LAST_SKIP_BITS(re, gb, ff_golomb_vlc_len[buf]); LAST_SKIP_BITS(re, gb, ff_golomb_vlc_len[buf]);
@ -117,24 +119,25 @@ static inline unsigned svq3_get_ue_golomb(GetBitContext *gb)
OPEN_READER(re, gb); OPEN_READER(re, gb);
UPDATE_CACHE(re, gb); UPDATE_CACHE(re, gb);
buf=GET_CACHE(re, gb); buf = GET_CACHE(re, gb);
if(buf&0xAA800000){ if (buf & 0xAA800000) {
buf >>= 32 - 8; buf >>= 32 - 8;
LAST_SKIP_BITS(re, gb, ff_interleaved_golomb_vlc_len[buf]); LAST_SKIP_BITS(re, gb, ff_interleaved_golomb_vlc_len[buf]);
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
return ff_interleaved_ue_golomb_vlc_code[buf]; return ff_interleaved_ue_golomb_vlc_code[buf];
}else{ } else {
unsigned ret = 1; unsigned ret = 1;
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;
ret |= ff_interleaved_dirac_golomb_vlc_code[buf]; ret |= ff_interleaved_dirac_golomb_vlc_code[buf];
break; break;
} }
ret = (ret << 4) | ff_interleaved_dirac_golomb_vlc_code[buf]; ret = (ret << 4) | ff_interleaved_dirac_golomb_vlc_code[buf];
@ -150,94 +153,104 @@ 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;
OPEN_READER(re, gb); OPEN_READER(re, gb);
UPDATE_CACHE(re, gb); UPDATE_CACHE(re, gb);
buf=GET_CACHE(re, gb); buf = GET_CACHE(re, gb);
if(buf >= (1<<27)){ if (buf >= (1 << 27)) {
buf >>= 32 - 9; buf >>= 32 - 9;
LAST_SKIP_BITS(re, gb, ff_golomb_vlc_len[buf]); LAST_SKIP_BITS(re, gb, ff_golomb_vlc_len[buf]);
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
return ff_se_golomb_vlc_code[buf]; return ff_se_golomb_vlc_code[buf];
}else{ } else {
log = av_log2(buf); log = av_log2(buf);
LAST_SKIP_BITS(re, gb, 31 - log); LAST_SKIP_BITS(re, gb, 31 - log);
UPDATE_CACHE(re, gb); UPDATE_CACHE(re, gb);
buf = GET_CACHE(re, gb); buf = GET_CACHE(re, gb);
buf>>= log; buf >>= log;
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;
OPEN_READER(re, gb); OPEN_READER(re, gb);
UPDATE_CACHE(re, gb); UPDATE_CACHE(re, gb);
buf=GET_CACHE(re, gb); buf = GET_CACHE(re, gb);
if(buf&0xAA800000){ if (buf & 0xAA800000) {
buf >>= 32 - 8; buf >>= 32 - 8;
LAST_SKIP_BITS(re, gb, ff_interleaved_golomb_vlc_len[buf]); LAST_SKIP_BITS(re, gb, ff_interleaved_golomb_vlc_len[buf]);
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
return ff_interleaved_se_golomb_vlc_code[buf]; return ff_interleaved_se_golomb_vlc_code[buf];
}else{ } else {
LAST_SKIP_BITS(re, gb, 8); LAST_SKIP_BITS(re, gb, 8);
UPDATE_CACHE(re, gb); UPDATE_CACHE(re, gb);
buf |= 1 | (GET_CACHE(re, gb) >> 8); buf |= 1 | (GET_CACHE(re, gb) >> 8);
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);
return (signed) (((((buf << log) >> log) - 1) ^ -(buf & 0x1)) + 1) >> 1; return (signed) (((((buf << log) >> log) - 1) ^ -(buf & 0x1)) + 1) >> 1;
} }
} }
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,24 +271,26 @@ 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;
OPEN_READER(re, gb); OPEN_READER(re, gb);
UPDATE_CACHE(re, gb); UPDATE_CACHE(re, gb);
buf=GET_CACHE(re, gb); buf = GET_CACHE(re, gb);
log= av_log2(buf); log = av_log2(buf);
if(log > 31-limit){ if (log > 31 - 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);
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
return buf; return buf;
}else{ } else {
LAST_SKIP_BITS(re, gb, limit); LAST_SKIP_BITS(re, gb, limit);
UPDATE_CACHE(re, gb); UPDATE_CACHE(re, gb);
@ -291,24 +306,27 @@ 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;
OPEN_READER(re, gb); OPEN_READER(re, gb);
UPDATE_CACHE(re, gb); UPDATE_CACHE(re, gb);
buf=GET_CACHE(re, gb); buf = GET_CACHE(re, gb);
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);
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
return buf; return buf;
}else{ } else {
int i; int i;
for (i = 0; i < limit && SHOW_UBITS(re, gb, 1) == 0; i++) { for (i = 0; i < limit && SHOW_UBITS(re, gb, 1) == 0; i++) {
if (gb->size_in_bits <= re_index) if (gb->size_in_bits <= re_index)
@ -318,23 +336,23 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int
} }
SKIP_BITS(re, gb, 1); SKIP_BITS(re, gb, 1);
if(i < limit - 1){ if (i < limit - 1) {
if(k){ if (k) {
buf = SHOW_UBITS(re, gb, k); buf = SHOW_UBITS(re, gb, k);
LAST_SKIP_BITS(re, gb, k); LAST_SKIP_BITS(re, gb, k);
}else{ } else {
buf=0; buf = 0;
} }
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
return buf + (i<<k); return buf + (i << k);
}else if(i == limit - 1){ } else if (i == limit - 1) {
buf = SHOW_UBITS(re, gb, esc_len); buf = SHOW_UBITS(re, gb, esc_len);
LAST_SKIP_BITS(re, gb, esc_len); LAST_SKIP_BITS(re, gb, esc_len);
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
return buf + 1; return buf + 1;
}else } else
return -1; return -1;
} }
} }
@ -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 v= get_ur_golomb(gb, k, limit, esc_len); int 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,22 +377,25 @@ 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 v= get_ur_golomb_jpegls(gb, k, limit, esc_len); int esc_len)
return (v>>1) ^ -(v&1); {
int v = get_ur_golomb_jpegls(gb, k, limit, esc_len);
return (v >> 1) ^ -(v & 1);
} }
/** /**
* 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);
} }
/** /**
* read signed golomb rice code (shorten). * read signed golomb rice code (shorten).
*/ */
static inline int get_sr_golomb_shorten(GetBitContext* gb, int k) static inline int get_sr_golomb_shorten(GetBitContext *gb, int k)
{ {
int uvar = get_ur_golomb_jpegls(gb, k + 1, INT_MAX, 0); int uvar = get_ur_golomb_jpegls(gb, k + 1, INT_MAX, 0);
if (uvar & 1) if (uvar & 1)
@ -379,22 +404,21 @@ 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,
int line) 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_ue_golomb(s); int i = get_ue_golomb(s);
int len= get_bits_count(s) - pos; int len = get_bits_count(s) - pos;
int bits= show>>(24-len); int bits = show >> (24 - len);
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;
} }
@ -402,87 +426,98 @@ static inline int get_ue(GetBitContext *s, const char *file, const char *func,
static inline int get_se(GetBitContext *s, const char *file, const char *func, static inline int get_se(GetBitContext *s, const char *file, const char *func,
int line) 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_se_golomb(s); int i = get_se_golomb(s);
int len= get_bits_count(s) - pos; int len = get_bits_count(s) - pos;
int bits= show>>(24-len); int bits = show >> (24 - len);
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 show= show_bits(s, 24); int line)
int pos= get_bits_count(s); {
int i= get_te0_golomb(s, r); int show = show_bits(s, 24);
int len= get_bits_count(s) - pos; int pos = get_bits_count(s);
int bits= show>>(24-len); int i = get_te0_golomb(s, r);
int len = get_bits_count(s) - pos;
int bits = show >> (24 - len);
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;
} }
#define get_ue_golomb(a) get_ue(a, __FILE__, __PRETTY_FUNCTION__, __LINE__) #define get_ue_golomb(a) get_ue(a, __FILE__, __PRETTY_FUNCTION__, __LINE__)
#define get_se_golomb(a) get_se(a, __FILE__, __PRETTY_FUNCTION__, __LINE__) #define get_se_golomb(a) get_se(a, __FILE__, __PRETTY_FUNCTION__, __LINE__)
#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);
#if 0 #if 0
if(i=0){ if (i = 0) {
put_bits(pb, 1, 1); put_bits(pb, 1, 1);
return; return;
} }
#endif #endif
if(i<256) if (i < 256)
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);
} }
} }
/** /**
* 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);
#endif #endif
set_ue_golomb(pb, i); set_ue_golomb(pb, i);
} }
@ -490,42 +525,45 @@ 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);
e= (i>>k) + 1; e = (i >> k) + 1;
if(e<limit){ if (e < limit) {
while(e > 31) { while (e > 31) {
put_bits(pb, 31, 0); put_bits(pb, 31, 0);
e -= 31; e -= 31;
} }
put_bits(pb, e, 1); put_bits(pb, e, 1);
if(k) if (k)
put_sbits(pb, k, i); put_sbits(pb, k, i);
}else{ } else {
while(limit > 31) { while (limit > 31) {
put_bits(pb, 31, 0); put_bits(pb, 31, 0);
limit -= 31; limit -= 31;
} }
put_bits(pb, limit , 1); put_bits(pb, limit, 1);
put_bits(pb, esc_len, i - 1); put_bits(pb, esc_len, i - 1);
} }
} }
@ -533,11 +571,13 @@ 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;
v ^= (v>>31); v ^= (v >> 31);
set_ur_golomb(pb, v, k, limit, esc_len); set_ur_golomb(pb, v, k, limit, esc_len);
} }
@ -545,11 +585,13 @@ 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;
v ^= (v>>31); v ^= (v >> 31);
set_ur_golomb_jpegls(pb, v, k, limit, esc_len); set_ur_golomb_jpegls(pb, v, k, limit, esc_len);
} }