diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-02-25 18:11:42 -0800 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2014-02-25 18:11:42 -0800 |
| commit | abe21e42e721a269aac964546f97652c34174cd6 (patch) | |
| tree | c211f1a14ce2e3ddf690c422ea8c5a9f1cfcf590 /vp9 | |
| parent | 4632a96d9771b49d6edfe78b68e5dfbafa75fff3 (diff) | |
| download | libvpx-abe21e42e721a269aac964546f97652c34174cd6.tar libvpx-abe21e42e721a269aac964546f97652c34174cd6.tar.gz libvpx-abe21e42e721a269aac964546f97652c34174cd6.tar.bz2 libvpx-abe21e42e721a269aac964546f97652c34174cd6.zip | |
Removing redundant vp9_clear_system_state() call.
This function is already called in vp9_initialize_rd_consts().
Change-Id: I88c0484a7274660287fa25fdf5cdb721d3284e01
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodemv.c | 17 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodemv.h | 8 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 3 |
3 files changed, 8 insertions, 20 deletions
diff --git a/vp9/encoder/vp9_encodemv.c b/vp9/encoder/vp9_encodemv.c index af710a8f4..be6abc2a1 100644 --- a/vp9/encoder/vp9_encodemv.c +++ b/vp9/encoder/vp9_encodemv.c @@ -224,18 +224,11 @@ void vp9_encode_mv(VP9_COMP* cpi, vp9_writer* w, } } -void vp9_build_nmv_cost_table(int *mvjoint, - int *mvcost[2], - const nmv_context* const mvctx, - int usehp, - int mvc_flag_v, - int mvc_flag_h) { - vp9_clear_system_state(); - vp9_cost_tokens(mvjoint, mvctx->joints, vp9_mv_joint_tree); - if (mvc_flag_v) - build_nmv_component_cost_table(mvcost[0], &mvctx->comps[0], usehp); - if (mvc_flag_h) - build_nmv_component_cost_table(mvcost[1], &mvctx->comps[1], usehp); +void vp9_build_nmv_cost_table(int *mvjoint, int *mvcost[2], + const nmv_context* ctx, int usehp) { + vp9_cost_tokens(mvjoint, ctx->joints, vp9_mv_joint_tree); + build_nmv_component_cost_table(mvcost[0], &ctx->comps[0], usehp); + build_nmv_component_cost_table(mvcost[1], &ctx->comps[1], usehp); } static void inc_mvs(int_mv mv[2], int_mv ref[2], int is_compound, diff --git a/vp9/encoder/vp9_encodemv.h b/vp9/encoder/vp9_encodemv.h index f0463bbd3..bb242b6dd 100644 --- a/vp9/encoder/vp9_encodemv.h +++ b/vp9/encoder/vp9_encodemv.h @@ -25,12 +25,8 @@ void vp9_write_nmv_probs(VP9_COMMON *cm, int usehp, vp9_writer *w); void vp9_encode_mv(VP9_COMP *cpi, vp9_writer* w, const MV* mv, const MV* ref, const nmv_context* mvctx, int usehp); -void vp9_build_nmv_cost_table(int *mvjoint, - int *mvcost[2], - const nmv_context* const mvctx, - int usehp, - int mvc_flag_v, - int mvc_flag_h); +void vp9_build_nmv_cost_table(int *mvjoint, int *mvcost[2], + const nmv_context* const mvctx, int usehp); void vp9_update_mv_count(VP9_COMP *cpi, MACROBLOCK *x, int_mv best_ref_mv[2]); diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 57417e0c6..2d6534ef6 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -310,8 +310,7 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi) { vp9_build_nmv_cost_table(x->nmvjointcost, cm->allow_high_precision_mv ? x->nmvcost_hp : x->nmvcost, - &cm->fc.nmvc, - cm->allow_high_precision_mv, 1, 1); + &cm->fc.nmvc, cm->allow_high_precision_mv); for (i = 0; i < INTER_MODE_CONTEXTS; ++i) vp9_cost_tokens((int *)x->inter_mode_cost[i], |