From c9f79ca85c96f0f1889bb525d75bb6dd905959d0 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Wed, 5 Mar 2014 11:22:09 -0800 Subject: [PATCH] Inlining and removing vp9_set_mbmode_and_mvs(). Change-Id: I9717ef611ef9c39b109b2358c9771bf7fae2dd50 --- vp9/encoder/vp9_firstpass.c | 3 ++- vp9/encoder/vp9_mbgraph.c | 4 +++- vp9/encoder/vp9_rdopt.c | 6 ------ vp9/encoder/vp9_rdopt.h | 3 --- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index b507c6e..d83c435 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -676,7 +676,8 @@ void vp9_first_pass(VP9_COMP *cpi) { mv.as_mv.row *= 8; mv.as_mv.col *= 8; this_error = motion_error; - vp9_set_mbmode_and_mvs(xd, NEWMV, &mv.as_mv); + xd->mi_8x8[0]->mbmi.mode = NEWMV; + xd->mi_8x8[0]->mbmi.mv[0] = mv; xd->mi_8x8[0]->mbmi.tx_size = TX_4X4; xd->mi_8x8[0]->mbmi.ref_frame[0] = LAST_FRAME; xd->mi_8x8[0]->mbmi.ref_frame[1] = NONE; diff --git a/vp9/encoder/vp9_mbgraph.c b/vp9/encoder/vp9_mbgraph.c index d3e19b4..6520389 100644 --- a/vp9/encoder/vp9_mbgraph.c +++ b/vp9/encoder/vp9_mbgraph.c @@ -61,7 +61,9 @@ static unsigned int do_16x16_motion_iteration(VP9_COMP *cpi, &sse); } - vp9_set_mbmode_and_mvs(xd, NEWMV, dst_mv); + xd->mi_8x8[0]->mbmi.mode = NEWMV; + xd->mi_8x8[0]->mbmi.mv[0].as_mv = *dst_mv; + vp9_build_inter_predictors_sby(xd, mb_row, mb_col, BLOCK_16X16); /* restore UMV window */ diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 510615c..6c42a8b 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1463,12 +1463,6 @@ static int cost_mv_ref(VP9_COMP *cpi, MB_PREDICTION_MODE mode, } } -void vp9_set_mbmode_and_mvs(MACROBLOCKD *xd, MB_PREDICTION_MODE mode, - const MV *mv) { - xd->mi_8x8[0]->mbmi.mode = mode; - xd->mi_8x8[0]->mbmi.mv[0].as_mv = *mv; -} - static void joint_motion_search(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize, int_mv *frame_mv, diff --git a/vp9/encoder/vp9_rdopt.h b/vp9/encoder/vp9_rdopt.h index b5baa33..e1a4676 100644 --- a/vp9/encoder/vp9_rdopt.h +++ b/vp9/encoder/vp9_rdopt.h @@ -77,9 +77,6 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, void vp9_init_me_luts(); -void vp9_set_mbmode_and_mvs(MACROBLOCKD *xd, MB_PREDICTION_MODE mode, - const MV *mv); - void vp9_get_entropy_contexts(BLOCK_SIZE bsize, TX_SIZE tx_size, const struct macroblockd_plane *pd, ENTROPY_CONTEXT t_above[16], -- 2.7.4