Mercurial > libavcodec.hg
diff golomb.h @ 2220:21947e176d4d libavcodec
get/set_sr_golomb() cleanup
author | michael |
---|---|
date | Fri, 10 Sep 2004 19:40:55 +0000 |
parents | 2a767157935e |
children | e98b5e0de86b |
line wrap: on
line diff
--- a/golomb.h Fri Sep 10 18:54:02 2004 +0000 +++ b/golomb.h Fri Sep 10 19:40:55 2004 +0000 @@ -263,7 +263,7 @@ /** * 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 @@ // 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 @@ 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 @@ /** * 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 @@ 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); -}