ref: 91036996ac3871dccf4c6cfe47504c7b99f8555c
parent: 610dd902881c64c294985e7676aff01fc7fd280c
parent: 15f03c2f137fd5e39e15b71cd5181340be762ac6
author: John Koleszar <jkoleszar@google.com>
date: Mon Apr 4 04:58:25 EDT 2011
Merge "Slightly simplify vp8_decode_mb_tokens."
--- a/vp8/decoder/detokenize.c
+++ b/vp8/decoder/detokenize.c
@@ -181,7 +181,7 @@
{
ENTROPY_CONTEXT *A = (ENTROPY_CONTEXT *)x->above_context;
ENTROPY_CONTEXT *L = (ENTROPY_CONTEXT *)x->left_context;
- const VP8_COMMON *const oc = & dx->common;
+ const FRAME_CONTEXT * const fc = &dx->common.fc;
BOOL_DECODER *bc = x->current_bc;
@@ -236,7 +236,7 @@
range = bc->range;
- coef_probs = oc->fc.coef_probs [type] [ 0 ] [0];
+ coef_probs = fc->coef_probs [type] [ 0 ] [0];
BLOCK_LOOP:
a = A + vp8_block2above[i];
@@ -348,7 +348,7 @@
type = 0;
i = 0;
stop = 16;
- coef_probs = oc->fc.coef_probs [type] [ 0 ] [0];
+ coef_probs = fc->coef_probs [type] [ 0 ] [0];
qcoeff_ptr -= (24*16 + 16);
goto BLOCK_LOOP;
}
@@ -356,7 +356,7 @@
if (i == 16)
{
type = 2;
- coef_probs = oc->fc.coef_probs [type] [ 0 ] [0];
+ coef_probs = fc->coef_probs [type] [ 0 ] [0];
stop = 24;
goto BLOCK_LOOP;
}