Update to opus-HEAD-66611f1.

celt/entenc.c

 /* Copyright (c) 2001-2011 Timothy B. Terriberry
    Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
 
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
 
@@ skipping 80 matching lines @@
       unsigned sym;
       sym=(EC_SYM_MAX+carry)&EC_SYM_MAX;
       do _this->error|=ec_write_byte(_this,sym);
       while(--(_this->ext)>0);
     }
     _this->rem=_c&EC_SYM_MAX;
   }
   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));
     /*Move the next-to-high-order symbol into the high-order position.*/
     _this->val=(_this->val<<EC_SYM_BITS)&(EC_CODE_TOP-1);
     _this->rng<<=EC_SYM_BITS;
     _this->nbits_total+=EC_SYM_BITS;
   }
 }
 
 void ec_enc_init(ec_enc *_this,unsigned char *_buf,opus_uint32 _size){
   _this->buf=_buf;
   _this->end_offs=0;
   _this->end_window=0;
   _this->nend_bits=0;
   /*This is the offset from which ec_tell() will subtract partial bits.*/
   _this->nbits_total=EC_CODE_BITS+1;
   _this->offs=0;
   _this->rng=EC_CODE_TOP;
   _this->rem=-1;
   _this->val=0;
   _this->ext=0;
   _this->storage=_size;
   _this->error=0;
 }
 
 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));
   }
   else _this->rng-=IMUL32(r,(_ft-_fh));
   ec_enc_normalize(_this);
 }
 
 void ec_encode_bin(ec_enc *_this,unsigned _fl,unsigned _fh,unsigned _bits){
   opus_uint32 r;
@@ skipping 144 matching lines @@
            would corrupt the range coder data, and that's more important.*/
         if(_this->offs+_this->end_offs>=_this->storage&&l<used){
           window&=(1<<l)-1;
           _this->error=-1;
         }
         _this->buf[_this->storage-_this->end_offs-1]|=(unsigned char)window;
       }
     }
   }
 }