diff options
| -rw-r--r-- | libavcodec/ffv1.c | 4 | ||||
| -rw-r--r-- | libavcodec/golomb.h | 29 |
2 files changed, 5 insertions, 28 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 70ca84fd18..af57faa5fa 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -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 diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 649664368b..f8b144a531 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -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); -} |