# HG changeset patch
# User darkshikari
# Date 1281575492 0
# Node ID d0b25641338b00b82599ccea8d36c5617450f507
# Parent  e1ef713061ce2b7ede9b8ad2df70f8fb3ca7a9db
VP5/6/8: ~7% faster arithmetic decoding
Grab from the bitstream in 16-bit chunks instead of 8-bit chunks.
TODO: grab in 32-bit chunks on 64-bit systems.

diff -r e1ef713061ce -r d0b25641338b vp56.h
--- a/vp56.h	Wed Aug 11 14:18:52 2010 +0000
+++ b/vp56.h	Thu Aug 12 01:11:32 2010 +0000
@@ -194,8 +194,8 @@
     code_word <<= shift;
     bits       += shift;
     if(bits >= 0 && c->buffer < c->end) {
-        code_word |= *c->buffer++ << bits;
-        bits -= 8;
+        code_word |= bytestream_get_be16(&c->buffer) << bits;
+        bits -= 16;
     }
     c->bits = bits;
     return code_word;
@@ -211,7 +211,7 @@
 {
     unsigned int code_word = vp56_rac_renorm(c);
     unsigned int low = 1 + (((c->high - 1) * prob) >> 8);
-    unsigned int low_shift = low << 8;
+    unsigned int low_shift = low << 16;
     int bit = code_word >= low_shift;
 
     c->high = bit ? c->high - low : low;
@@ -226,7 +226,7 @@
 {
     unsigned long code_word = vp56_rac_renorm(c);
     unsigned low = 1 + (((c->high - 1) * prob) >> 8);
-    unsigned low_shift = low << 8;
+    unsigned low_shift = low << 16;
 
     if (code_word >= low_shift) {
         c->high     -= low;
@@ -244,7 +244,7 @@
     unsigned int code_word = vp56_rac_renorm(c);
     /* equiprobable */
     int low = (c->high + 1) >> 1;
-    unsigned int low_shift = low << 8;
+    unsigned int low_shift = low << 16;
     int bit = code_word >= low_shift;
     if (bit) {
         c->high   -= low;
diff -r e1ef713061ce -r d0b25641338b vp56rac.c
--- a/vp56rac.c	Wed Aug 11 14:18:52 2010 +0000
+++ b/vp56rac.c	Thu Aug 12 01:11:32 2010 +0000
@@ -40,8 +40,8 @@
 void ff_vp56_init_range_decoder(VP56RangeCoder *c, const uint8_t *buf, int buf_size)
 {
     c->high = 255;
-    c->bits = -8;
+    c->bits = -16;
     c->buffer = buf;
     c->end = buf + buf_size;
-    c->code_word = bytestream_get_be16(&c->buffer);
+    c->code_word = bytestream_get_be24(&c->buffer);
 }
diff -r e1ef713061ce -r d0b25641338b x86/vp56_arith.h
--- a/x86/vp56_arith.h	Wed Aug 11 14:18:52 2010 +0000
+++ b/x86/vp56_arith.h	Thu Aug 12 01:11:32 2010 +0000
@@ -31,7 +31,7 @@
     unsigned int code_word = vp56_rac_renorm(c);
     unsigned int high = c->high;
     unsigned int low = 1 + (((high - 1) * prob) >> 8);
-    unsigned int low_shift = low << 8;
+    unsigned int low_shift = low << 16;
     int bit = 0;
 
     __asm__(