libvpx: Pull from upstream

source/libvpx/vp8/encoder/tokenize.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 195 matching lines @@
     const short *qcoeff_ptr;
     ENTROPY_CONTEXT * a;
     ENTROPY_CONTEXT * l;
     int band, rc, v;
     int tmp1, tmp2;
 
     b = xd->block;
     /* Luma */
     for (block = 0; block < 16; block++, b++)
     {
+        const int eob = *b->eob;
         tmp1 = vp8_block2above[block];
         tmp2 = vp8_block2left[block];
         qcoeff_ptr = b->qcoeff;
         a = (ENTROPY_CONTEXT *)xd->above_context + tmp1;
         l = (ENTROPY_CONTEXT *)xd->left_context + tmp2;
 
         VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
 
         c = type ? 0 : 1;
 
-        if(c >= *b->eob)
+        if(c >= eob)
         {
             /* c = band for this case */
             t->Token = DCT_EOB_TOKEN;
             t->context_tree = cpi->common.fc.coef_probs [type] [c] [pt];
             t->skip_eob_node = 0;
 
             ++x->coef_counts       [type] [c] [pt] [DCT_EOB_TOKEN];
             t++;
             *tp = t;
             *a = *l = 0;
             continue;
         }
 
         v = qcoeff_ptr[c];
 
         t->Extra = vp8_dct_value_tokens_ptr[v].Extra;
         token    = vp8_dct_value_tokens_ptr[v].Token;
         t->Token = token;
 
         t->context_tree = cpi->common.fc.coef_probs [type] [c] [pt];
         t->skip_eob_node = 0;
         ++x->coef_counts       [type] [c] [pt] [token];
         pt = vp8_prev_token_class[token];
         t++;
         c++;
 
-        for (; c < *b->eob; c++)
+        assert(eob <= 16);
+        for (; c < eob; c++)
         {
             rc = vp8_default_zig_zag1d[c];
             band = vp8_coef_bands[c];
             v = qcoeff_ptr[rc];
 
             t->Extra = vp8_dct_value_tokens_ptr[v].Extra;
             token    = vp8_dct_value_tokens_ptr[v].Token;
 
             t->Token = token;
             t->context_tree = cpi->common.fc.coef_probs [type] [band] [pt];
@@ skipping 15 matching lines @@
 
             t++;
         }
         *tp = t;
         *a = *l = 1;
     }
 
     /* Chroma */
     for (block = 16; block < 24; block++, b++)
     {
+        const int eob = *b->eob;
         tmp1 = vp8_block2above[block];
         tmp2 = vp8_block2left[block];
         qcoeff_ptr = b->qcoeff;
         a = (ENTROPY_CONTEXT *)xd->above_context + tmp1;
         l = (ENTROPY_CONTEXT *)xd->left_context + tmp2;
 
         VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
 
-        if(!(*b->eob))
+        if(!eob)
         {
             /* c = band for this case */
             t->Token = DCT_EOB_TOKEN;
             t->context_tree = cpi->common.fc.coef_probs [2] [0] [pt];
             t->skip_eob_node = 0;
 
             ++x->coef_counts       [2] [0] [pt] [DCT_EOB_TOKEN];
             t++;
             *tp = t;
             *a = *l = 0;
             continue;
         }
 
         v = qcoeff_ptr[0];
 
         t->Extra = vp8_dct_value_tokens_ptr[v].Extra;
         token    = vp8_dct_value_tokens_ptr[v].Token;
         t->Token = token;
 
         t->context_tree = cpi->common.fc.coef_probs [2] [0] [pt];
         t->skip_eob_node = 0;
         ++x->coef_counts       [2] [0] [pt] [token];
         pt = vp8_prev_token_class[token];
         t++;
         c = 1;
 
-        for (; c < *b->eob; c++)
+        assert(eob <= 16);
+        for (; c < eob; c++)
         {
             rc = vp8_default_zig_zag1d[c];
             band = vp8_coef_bands[c];
             v = qcoeff_ptr[rc];
 
             t->Extra = vp8_dct_value_tokens_ptr[v].Extra;
             token    = vp8_dct_value_tokens_ptr[v].Token;
 
             t->Token = token;
             t->context_tree = cpi->common.fc.coef_probs [2] [band] [pt];
@@ skipping 260 matching lines @@
         vpx_memset(x->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES));
         vpx_memset(x->left_context, 0, sizeof(ENTROPY_CONTEXT_PLANES));
     }
     else
     {
         vpx_memset(x->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES)-1);
         vpx_memset(x->left_context, 0, sizeof(ENTROPY_CONTEXT_PLANES)-1);
     }
 
 }