diff options
| author | flim <flim@google.com> | 2016-01-26 14:33:44 +0100 |
|---|---|---|
| committer | flim <flim@google.com> | 2016-03-04 17:40:32 +0100 |
| commit | c91ee5b5642fcc4969150f73d5f6848f88bf1638 (patch) | |
| tree | 900cb39b975dfed729e37e5810fef61fd92d7a70 /celt/entenc.c | |
| parent | 1391dbf0ccd121ce7a49d30e2142d36c8d404990 (diff) | |
| download | libopus-c91ee5b5642fcc4969150f73d5f6848f88bf1638.tar.gz | |
Upgrade Opus to v1.1.2android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3
Change-Id: I8211751bab026ab236a612c6e0873f8bdbcd6c98
Diffstat (limited to 'celt/entenc.c')
| -rw-r--r-- | celt/entenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/celt/entenc.c b/celt/entenc.c index a7e34ece..f1750d25 100644 --- a/celt/entenc.c +++ b/celt/entenc.c @@ -98,7 +98,7 @@ static void ec_enc_carry_out(ec_enc *_this,int _c){ else _this->ext++; } -static void ec_enc_normalize(ec_enc *_this){ +static OPUS_INLINE void ec_enc_normalize(ec_enc *_this){ /*If the range is too small, output some bits and rescale it.*/ while(_this->rng<=EC_CODE_BOT){ ec_enc_carry_out(_this,(int)(_this->val>>EC_CODE_SHIFT)); @@ -127,7 +127,7 @@ void ec_enc_init(ec_enc *_this,unsigned char *_buf,opus_uint32 _size){ void ec_encode(ec_enc *_this,unsigned _fl,unsigned _fh,unsigned _ft){ opus_uint32 r; - r=_this->rng/_ft; + r=celt_udiv(_this->rng,_ft); if(_fl>0){ _this->val+=_this->rng-IMUL32(r,(_ft-_fl)); _this->rng=IMUL32(r,(_fh-_fl)); |