diff options
Diffstat (limited to 'vp9/encoder/vp9_modecosts.c')
| -rw-r--r-- | vp9/encoder/vp9_modecosts.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/vp9/encoder/vp9_modecosts.c b/vp9/encoder/vp9_modecosts.c index 7d9462f94..f2e4ce40f 100644 --- a/vp9/encoder/vp9_modecosts.c +++ b/vp9/encoder/vp9_modecosts.c @@ -17,32 +17,23 @@ void vp9_init_mode_costs(VP9_COMP *c) { VP9_COMMON *x = &c->common; - const vp9_tree_p T = vp9_bmode_tree; - const vp9_tree_p KT = vp9_kf_bmode_tree; + const vp9_tree_p KT = vp9_intra_mode_tree; int i, j; - for (i = 0; i < VP9_KF_BINTRAMODES; i++) { - for (j = 0; j < VP9_KF_BINTRAMODES; j++) { - vp9_cost_tokens((int *)c->mb.bmode_costs[i][j], - x->kf_bmode_prob[i][j], KT); + for (i = 0; i < VP9_INTRA_MODES; i++) { + for (j = 0; j < VP9_INTRA_MODES; j++) { + vp9_cost_tokens((int *)c->mb.y_mode_costs[i][j], + x->kf_y_mode_prob[i][j], KT); } } - vp9_cost_tokens((int *)c->mb.inter_bmode_costs, x->fc.bmode_prob, T); - vp9_cost_tokens((int *)c->mb.inter_bmode_costs, - x->fc.sub_mv_ref_prob[0], vp9_sub_mv_ref_tree); - // TODO(rbultje) separate tables for superblock costing? - vp9_cost_tokens(c->mb.mbmode_cost[1], x->fc.ymode_prob, vp9_ymode_tree); - vp9_cost_tokens(c->mb.mbmode_cost[0], - x->kf_ymode_prob[c->common.kf_ymode_probs_index], - vp9_kf_ymode_tree); + vp9_cost_tokens(c->mb.mbmode_cost, x->fc.y_mode_prob[1], + vp9_intra_mode_tree); vp9_cost_tokens(c->mb.intra_uv_mode_cost[1], - x->fc.uv_mode_prob[VP9_YMODES - 1], vp9_uv_mode_tree); + x->fc.uv_mode_prob[VP9_INTRA_MODES - 1], vp9_intra_mode_tree); vp9_cost_tokens(c->mb.intra_uv_mode_cost[0], - x->kf_uv_mode_prob[VP9_YMODES - 1], vp9_uv_mode_tree); - vp9_cost_tokens(c->mb.i8x8_mode_costs, - x->fc.i8x8_mode_prob, vp9_i8x8_mode_tree); + x->kf_uv_mode_prob[VP9_INTRA_MODES - 1], vp9_intra_mode_tree); for (i = 0; i <= VP9_SWITCHABLE_FILTERS; ++i) vp9_cost_tokens((int *)c->mb.switchable_interp_costs[i], |