Merge remote branch 'origin/master' into experimental

Conflicts:
	vp8/decoder/detokenize.c
	vp8/decoder/onyxd_int.h

Change-Id: Idc301ae630dc1aedeb85674ecfdcf1eb28420f81

diff --cc vp8/decoder/detokenize.c
index 78d583782013eae69cb9b88a3c394920a11db49b,1a71948cbf3de6243caafddbcf8c2e6d15b79e4a..795a3082f9f483da7c2c56f787b11541d5e5712e
--- 1/vp8/decoder/detokenize.c
--- 2/vp8/decoder/detokenize.c
+++ b/vp8/decoder/detokenize.c
@@@ -38,31 -38,34 +38,34 @@@ DECLARE_ALIGNED(16, static const unsign
  #define CAT_THREE_CONTEXT_NODE      9
  #define CAT_FIVE_CONTEXT_NODE       10
  
- /*
- //the definition is put in "onyxd_int.h"
- typedef struct
- {
-     INT16         min_val;
-     INT16         Length;
-     UINT8 Probs[14];
- } TOKENEXTRABITS;
- */
+ #define CAT1_MIN_VAL    5
+ #define CAT2_MIN_VAL    7
+ #define CAT3_MIN_VAL   11
+ #define CAT4_MIN_VAL   19
+ #define CAT5_MIN_VAL   35
+ #define CAT6_MIN_VAL   67
  
- DECLARE_ALIGNED(16, static const TOKENEXTRABITS, vp8d_token_extra_bits2[MAX_ENTROPY_TOKENS]) =
- {
-     {  0, -1, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },  /* ZERO_TOKEN */
-     {  1, 0, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },   /* ONE_TOKEN */
-     {  2, 0, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },   /* TWO_TOKEN */
-     {  3, 0, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },   /* THREE_TOKEN */
-     {  4, 0, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },   /* FOUR_TOKEN */
-     {  5, 0, { 159, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },  /* DCT_VAL_CATEGORY1 */
-     {  7, 1, { 145, 165, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } }, /* DCT_VAL_CATEGORY2 */
-     { 11, 2, { 140, 148, 173, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } }, /* DCT_VAL_CATEGORY3 */
-     { 19, 3, { 135, 140, 155, 176, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } }, /* DCT_VAL_CATEGORY4 */
-     { 35, 4, { 130, 134, 141, 157, 180, 0,  0,  0,  0,  0,  0,  0,  0,  0   } }, /* DCT_VAL_CATEGORY5 */
-     { 67, 12, { 129, 130, 133, 140, 153, 177, 196, 230, 243, 249, 252, 254, 254,  0   } }, /* DCT_VAL_CATEGORY6 */
-     {  0, -1, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },  /*  EOB TOKEN */
- };
+ #define CAT1_PROB0    159
+ #define CAT2_PROB0    145
+ #define CAT2_PROB1    165
+ 
+ #define CAT3_PROB0 140
+ #define CAT3_PROB1 148
+ #define CAT3_PROB2 173
+ 
+ #define CAT4_PROB0 135
+ #define CAT4_PROB1 140
+ #define CAT4_PROB2 155
+ #define CAT4_PROB3 176
+ 
+ #define CAT5_PROB0 130
+ #define CAT5_PROB1 134
+ #define CAT5_PROB2 141
+ #define CAT5_PROB3 157
+ #define CAT5_PROB4 180
+ 
 -static const unsigned char cat6_prob[12] =
 -{ 129, 130, 133, 140, 153, 177, 196, 230, 243, 254, 254, 0 };
++static const unsigned char cat6_prob[14] =
++{ 129, 130, 133, 140, 153, 177, 196, 230, 243, 249, 252, 254, 254, 0 };
  
  
  void vp8_reset_mb_tokens_context(MACROBLOCKD *x)
@@@ -256,12 -261,17 +261,17 @@@ DO_WHILE
  CHECK_0_:
      DECODE_AND_LOOP_IF_ZERO(Prob[ZERO_CONTEXT_NODE], CHECK_0_);
      DECODE_AND_BRANCH_IF_ZERO(Prob[ONE_CONTEXT_NODE], ONE_CONTEXT_NODE_0_);
-     DECODE_AND_BRANCH_IF_ZERO(Prob[LOW_VAL_CONTEXT_NODE], LOW_VAL_CONTEXT_NODE_0_);
-     DECODE_AND_BRANCH_IF_ZERO(Prob[HIGH_LOW_CONTEXT_NODE], HIGH_LOW_CONTEXT_NODE_0_);
-     DECODE_AND_BRANCH_IF_ZERO(Prob[CAT_THREEFOUR_CONTEXT_NODE], CAT_THREEFOUR_CONTEXT_NODE_0_);
-     DECODE_AND_BRANCH_IF_ZERO(Prob[CAT_FIVE_CONTEXT_NODE], CAT_FIVE_CONTEXT_NODE_0_);
-     val = vp8d_token_extra_bits2[DCT_VAL_CATEGORY6].min_val;
-     bits_count = vp8d_token_extra_bits2[DCT_VAL_CATEGORY6].Length;
+     DECODE_AND_BRANCH_IF_ZERO(Prob[LOW_VAL_CONTEXT_NODE],
+                               LOW_VAL_CONTEXT_NODE_0_);
+     DECODE_AND_BRANCH_IF_ZERO(Prob[HIGH_LOW_CONTEXT_NODE],
+                               HIGH_LOW_CONTEXT_NODE_0_);
+     DECODE_AND_BRANCH_IF_ZERO(Prob[CAT_THREEFOUR_CONTEXT_NODE],
+                               CAT_THREEFOUR_CONTEXT_NODE_0_);
+     DECODE_AND_BRANCH_IF_ZERO(Prob[CAT_FIVE_CONTEXT_NODE],
+                               CAT_FIVE_CONTEXT_NODE_0_);
+ 
+     val = CAT6_MIN_VAL;
 -    bits_count = 10;
++    bits_count = 12;
  
      do
      {