Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get/set_sr_golomb() cleanup

Browse Source 
Originally committed as revision 3451 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 21 years ago
parent 8bf5d58f86
commit a6c01275ad
2 changed files with 5 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavcodec/ffv1.c
  2. 29
      libavcodec/golomb.h

4
libavcodec/ffv1.c
Unescape View File

@ -325,7 +325,7 @@ static inline void put_vlc_symbol(PutBitContext *pb, VlcState * const state, int
#endif
//printf("v:%d/%d bias:%d error:%d drift:%d count:%d k:%d\n", v, code, state->bias, state->error_sum, state->drift, state->count, k);
set_sr_golomb_ffv1(pb, code, k, 12, bits);
set_sr_golomb(pb, code, k, 12, bits);
update_vlc_state(state, v);
}
@ -342,7 +342,7 @@ static inline int get_vlc_symbol(GetBitContext *gb, VlcState * const state, int
assert(k<=8);
v= get_sr_golomb_ffv1(gb, k, 12, bits);
v= get_sr_golomb(gb, k, 12, bits);
//printf("v:%d bias:%d error:%d drift:%d count:%d k:%d", v, state->bias, state->error_sum, state->drift, state->count, k);
#if 0 // JPEG LS

29
libavcodec/golomb.h
Unescape View File

@ -263,7 +263,7 @@ 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_ffv1(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++;
@ -272,8 +272,8 @@ static inline int get_sr_golomb_ffv1(GetBitContext *gb, int k, int limit, int es
// return (v>>1) ^ -(v&1);
}
/**
/**
* read signed golomb rice code (flac).
*/
static inline int get_sr_golomb_flac(GetBitContext *gb, int k, int limit, int esc_len){
@ -281,17 +281,6 @@ static inline int get_sr_golomb_flac(GetBitContext *gb, int k, int limit, int es
return (v>>1) ^ -(v&1);
}
/**
* read signed golomb rice code (sonic).
*/
static inline int get_sr_golomb_sonic(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;
}
#ifdef TRACE
static inline int get_ue(GetBitContext *s, char *file, char *func, int line){
@ -432,7 +421,7 @@ 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_ffv1(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;
@ -452,15 +441,3 @@ static inline void set_sr_golomb_flac(PutBitContext *pb, int i, int k, int limit
set_ur_golomb_jpegls(pb, v, k, limit, esc_len);
}
/**
* write signed golomb rice code (sonic).
*/
static inline void set_sr_golomb_sonic(PutBitContext *pb, int i, int k, int limit, int esc_len){
int v;
v = 2*i-1;
if (v<0) v ^= -1;
set_ur_golomb(pb, v, k, limit, esc_len);
}

Write Preview
Loading…
Cancel
Save