ref: 63d9c4da5e0556f4716fe6c10655b757036546b1
parent: 056bcc877111cfb4c32daf1c493df3d86eb1ec35
parent: d6020f9d52cbaa9629e3a3c6ad023360c9e7b483
author: John Koleszar <jkoleszar@google.com>
date: Wed Dec 21 04:20:21 EST 2011
Merge "tokenizer: use correct block type context in stuff1st_order_b"
--- a/vp8/encoder/tokenize.c
+++ b/vp8/encoder/tokenize.c
@@ -514,17 +514,19 @@
TOKENEXTRA **tp,
ENTROPY_CONTEXT *a,
ENTROPY_CONTEXT *l,
+ int type,
VP8_COMP *cpi
)
{int pt; /* near block/prev token context index */
+ int band;
TOKENEXTRA *t = *tp; /* store tokens starting here */
VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);
-
+ band = type ? 0 : 1;
t->Token = DCT_EOB_TOKEN;
- t->context_tree = cpi->common.fc.coef_probs [0] [1] [pt];
+ t->context_tree = cpi->common.fc.coef_probs [type] [band] [pt];
t->skip_eob_node = 0;
- ++cpi->coef_counts [0] [1] [pt] [DCT_EOB_TOKEN];
+ ++cpi->coef_counts [type] [band] [pt] [DCT_EOB_TOKEN];
++t;
*tp = t;
pt = 0; /* 0 <-> all coeff data is zero */
@@ -561,15 +563,19 @@
ENTROPY_CONTEXT * L = (ENTROPY_CONTEXT *)x->left_context;
int plane_type;
int b;
-
- stuff2nd_order_b(t,
+ plane_type = 3;
+ if((x->mode_info_context->mbmi.mode != B_PRED
+ && x->mode_info_context->mbmi.mode != SPLITMV))
+ {+ stuff2nd_order_b(t,
A + vp8_block2above[24], L + vp8_block2left[24], cpi);
- plane_type = 0;
+ plane_type = 0;
+ }
for (b = 0; b < 16; b++)
stuff1st_order_b(t,
A + vp8_block2above[b],
- L + vp8_block2left[b], cpi);
+ L + vp8_block2left[b], plane_type, cpi);
for (b = 16; b < 24; b++)
stuff1st_order_buv(t,