Move fine_priority calculation after the bust cap.
[opus.git] / libcelt / entenc.c
index 82f208e..9be46b1 100644 (file)
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#if defined(HAVE_CONFIG_H)
+# include "config.h"
 #endif
-
 #include "os_support.h"
 #include "entenc.h"
 #include "arch.h"
 
 
-void ec_byte_writeinit_buffer(ec_byte_buffer *_b, unsigned char *_buf, long _size){
-  _b->ptr=_b->buf=_buf;
-  _b->end_ptr=_b->buf+_size-1;
+void ec_byte_writeinit_buffer(ec_byte_buffer *_b,
+ unsigned char *_buf,ec_uint32 _size){
+  _b->buf=_buf;
+  _b->end_offs=_b->offs=0;
   _b->storage=_size;
 }
 
-void ec_byte_shrink(ec_byte_buffer *_b, long _size){
-   _b->end_ptr=_b->buf+_size-1;
-   _b->storage=_size;
+void ec_byte_shrink(ec_byte_buffer *_b,ec_uint32 _size){
+  celt_assert(_b->offs+_b->end_offs<=_size);
+  CELT_MOVE(_b->buf+_size-_b->end_offs,
+   _b->buf+_b->storage-_b->end_offs,_b->end_offs);
+  _b->storage=_size;
 }
 
-int ec_byte_write1(ec_byte_buffer *_b,unsigned _value){
-  ptrdiff_t endbyte;
-  endbyte=_b->ptr-_b->buf;
-  if(endbyte>=_b->storage){
-    return 1;
-  } else {
-    *(_b->ptr++)=(unsigned char)_value;
-    return 0;
-  }
+int ec_byte_write(ec_byte_buffer *_b,unsigned _value){
+  if(_b->offs+_b->end_offs>=_b->storage)return -1;
+  _b->buf[_b->offs++]=(unsigned char)_value;
+  return 0;
 }
 
 int ec_byte_write_at_end(ec_byte_buffer *_b,unsigned _value){
-  if (_b->end_ptr < _b->ptr)
-  {
-    return 1;
-  } else {
-    *(_b->end_ptr--)=(unsigned char)_value;
-    return 0;
-  }
+  if(_b->offs+_b->end_offs>=_b->storage)return -1;
+  _b->buf[_b->storage-++(_b->end_offs)]=(unsigned char)_value;
+  return 0;
 }
 
-
-void ec_enc_bits(ec_enc *_this,ec_uint32 _fl,int _ftb){
-  unsigned fl;
-  unsigned ft;
-  while(_ftb>EC_UNIT_BITS){
-    _ftb-=EC_UNIT_BITS;
-    fl=(unsigned)(_fl>>_ftb)&EC_UNIT_MASK;
-    ec_encode_raw(_this,fl,fl+1,EC_UNIT_BITS);
+int ec_byte_write_done(ec_byte_buffer *_b,int _start_bits_available,
+ unsigned _end_byte,int _end_bits_used){
+  int ret;
+  CELT_MEMSET(_b->buf+_b->offs,0,_b->storage-_b->offs-_b->end_offs);
+  ret=0;
+  if(_end_bits_used>0){
+    if(_b->offs+_b->end_offs>=_b->storage){
+      /*If there's no range coder data at all, give up.*/
+      if(_b->end_offs>=_b->storage)return -1;
+      /*If we've busted, don't add too many extra bits to the last byte; it
+         would corrupt the range coder data, and that's more important.*/
+      if(_start_bits_available<_end_bits_used){
+        _end_bits_used=_start_bits_available;
+        _end_byte&=(1<<_start_bits_available)-1;
+        ret=-1;
+      }
+    }
+    _b->buf[_b->storage-_b->end_offs-1]|=_end_byte;
   }
-  ft=1<<_ftb;
-  fl=(unsigned)_fl&ft-1;
-  ec_encode_raw(_this,fl,fl+1,_ftb);
+  return ret;
 }
 
 void ec_enc_uint(ec_enc *_this,ec_uint32 _fl,ec_uint32 _ft){
@@ -92,18 +93,16 @@ void ec_enc_uint(ec_enc *_this,ec_uint32 _fl,ec_uint32 _ft){
   celt_assert(_ft>1);
   _ft--;
   ftb=EC_ILOG(_ft);
-  if(ftb>EC_UNIT_BITS){
-    ftb-=EC_UNIT_BITS;
+  if(ftb>EC_UINT_BITS){
+    ftb-=EC_UINT_BITS;
     ft=(_ft>>ftb)+1;
     fl=(unsigned)(_fl>>ftb);
     ec_encode(_this,fl,fl+1,ft);
-    ec_enc_bits(_this,_fl,ftb);
-  } else {
-    ec_encode(_this,_fl,_fl+1,_ft+1);
+    ec_enc_bits(_this,_fl&((ec_uint32)1<<ftb)-1,ftb);
   }
+  else ec_encode(_this,_fl,_fl+1,_ft+1);
 }
 
-int ec_enc_get_error(ec_enc *_this)
-{
+int ec_enc_get_error(ec_enc *_this){
   return _this->error;
 }