Commit fd8fda99 authored by Jean-Marc Valin's avatar Jean-Marc Valin
Browse files

Making a few functions static inline

parent 98c86c78
...@@ -6,17 +6,7 @@ ...@@ -6,17 +6,7 @@
void ec_byte_reset(ec_byte_buffer *_b){
_b->ptr=_b->buf;
}
long ec_byte_bytes(ec_byte_buffer *_b){
return _b->ptr-_b->buf;
}
unsigned char *ec_byte_get_buffer(ec_byte_buffer *_b){
return _b->buf;
}
......
...@@ -44,9 +44,17 @@ void ec_byte_adv4(ec_byte_buffer *_b); ...@@ -44,9 +44,17 @@ void ec_byte_adv4(ec_byte_buffer *_b);
int ec_byte_read1(ec_byte_buffer *_b); int ec_byte_read1(ec_byte_buffer *_b);
int ec_byte_read4(ec_byte_buffer *_b,ec_uint32 *_val); int ec_byte_read4(ec_byte_buffer *_b,ec_uint32 *_val);
/*Shared functions.*/ /*Shared functions.*/
void ec_byte_reset(ec_byte_buffer *_b); static inline void ec_byte_reset(ec_byte_buffer *_b){
long ec_byte_bytes(ec_byte_buffer *_b); _b->ptr=_b->buf;
unsigned char *ec_byte_get_buffer(ec_byte_buffer *_b); }
static inline long ec_byte_bytes(ec_byte_buffer *_b){
return _b->ptr-_b->buf;
}
static inline unsigned char *ec_byte_get_buffer(ec_byte_buffer *_b){
return _b->buf;
}
int ec_ilog(ec_uint32 _v); int ec_ilog(ec_uint32 _v);
int ec_ilog64(ec_uint64 _v); int ec_ilog64(ec_uint64 _v);
......
...@@ -132,7 +132,7 @@ static int ec_dec_in(ec_dec *_this){ ...@@ -132,7 +132,7 @@ static int ec_dec_in(ec_dec *_this){
/*Normalizes the contents of dif and rng so that rng lies entirely in the /*Normalizes the contents of dif and rng so that rng lies entirely in the
high-order symbol.*/ high-order symbol.*/
static void ec_dec_normalize(ec_dec *_this){ static inline void ec_dec_normalize(ec_dec *_this){
/*If the range is too small, rescale it and input some bits.*/ /*If the range is too small, rescale it and input some bits.*/
while(_this->rng<=EC_CODE_BOT){ while(_this->rng<=EC_CODE_BOT){
int sym; int sym;
......
...@@ -63,7 +63,7 @@ static void ec_enc_carry_out(ec_enc *_this,int _c){ ...@@ -63,7 +63,7 @@ static void ec_enc_carry_out(ec_enc *_this,int _c){
else _this->ext++; else _this->ext++;
} }
static void ec_enc_normalize(ec_enc *_this){ static inline void ec_enc_normalize(ec_enc *_this){
/*If the range is too small, output some bits and rescale it.*/ /*If the range is too small, output some bits and rescale it.*/
while(_this->rng<=EC_CODE_BOT){ while(_this->rng<=EC_CODE_BOT){
ec_enc_carry_out(_this,(int)(_this->low>>EC_CODE_SHIFT)); ec_enc_carry_out(_this,(int)(_this->low>>EC_CODE_SHIFT));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment