From 9984a155d6bb7b81bbe2260e0f5807208fa103e2 Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Fri, 27 Jul 2012 11:29:46 -0700 Subject: Merges several experiments The following five experiments are merged: newentropy newupdate adaptive_entropy (also includes a couple of parameter changes that improves results a little in common/entropymode.c and encoder/modecosts.c that were not merged from the internal branch) newintramodes expanded_coef_context Change-Id: I8a142a831786ee9dc936f22be1d42a8bced7d270 --- vp8/encoder/modecosts.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'vp8/encoder/modecosts.c') diff --git a/vp8/encoder/modecosts.c b/vp8/encoder/modecosts.c index 7a9c19a82..8752eead7 100644 --- a/vp8/encoder/modecosts.c +++ b/vp8/encoder/modecosts.c @@ -32,13 +32,8 @@ void vp8_init_mode_costs(VP8_COMP *c) { vp8_cost_tokens((int *)c->mb.inter_bmode_costs, x->fc.bmode_prob, T); } -#if CONFIG_ADAPTIVE_ENTROPY vp8_cost_tokens((int *)c->mb.inter_bmode_costs, - vp8_sub_mv_ref_prob, vp8_sub_mv_ref_tree); -#else - vp8_cost_tokens(c->mb.inter_bmode_costs, - vp8_sub_mv_ref_prob, vp8_sub_mv_ref_tree); -#endif + x->fc.sub_mv_ref_prob[0], vp8_sub_mv_ref_tree); vp8_cost_tokens(c->mb.mbmode_cost[1], x->fc.ymode_prob, vp8_ymode_tree); vp8_cost_tokens(c->mb.mbmode_cost[0], -- cgit v1.2.3