From 61ccfcc00950ae53725abc50435b2cce72ec8deb Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 30 May 2003 01:05:48 +0000 Subject: [PATCH] (truncated) unary binerization unary k-th order exp golomb binarization Originally committed as revision 1920 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/cabac.c | 44 ++++++++++++--- libavcodec/cabac.h | 134 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+), 9 deletions(-) diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c index 4d018823f2..c4bd2740cb 100644 --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@ -127,49 +127,75 @@ void ff_init_cabac_states(CABACContext *c, uint8_t const (*lps_range)[4], int main(){ CABACContext c; uint8_t b[9*SIZE]; - uint8_t bit[9*SIZE]; + uint8_t r[9*SIZE]; int i; - uint8_t state= 0; + uint8_t state[10]= {0}; ff_init_cabac_encoder(&c, b, SIZE); ff_init_cabac_states(&c, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64); for(i=0; i write zero bit, !=0 write one bit + */ static inline void put_cabac_bypass(CABACContext *c, int bit){ c->low += c->low; @@ -158,6 +161,82 @@ static inline void put_cabac_terminate(CABACContext *c, int bit){ #endif } +/** + * put (truncated) unary binarization. + */ +static inline void put_cabac_u(CABACContext *c, uint8_t * state, int v, int max, int max_index, int truncated){ + int i; + + assert(v <= max); + +#if 1 + for(i=0; i= m){ //FIXME optimize + put_cabac_bypass(c, 1); + v-= m; + m+= m; + } + put_cabac_bypass(c, 0); + while(m>>=1){ + put_cabac_bypass(c, v&m); + } + } + + if(is_signed) + put_cabac_bypass(c, sign); + } +} + static inline void renorm_cabac_decoder(CABACContext *c){ while(c->range < 0x10000){ c->range+= c->range; @@ -230,3 +309,58 @@ static inline int get_cabac_terminate(CABACContext *c){ } } +/** + * get (truncated) unnary binarization. + */ +static inline int get_cabac_u(CABACContext *c, uint8_t * state, int max, int max_index, int truncated){ + int i; + + for(i=0; i>=1){ + v+= v + get_cabac_bypass(c); + } + i += v; + + if(is_signed && get_cabac_bypass(c)){ + return -i; + }else + return i; +}