diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-03-05 21:45:48 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-05 21:45:48 -0800 |
| commit | 89c3da568f5dd9c5935b58a9e1466e46f82dbe35 (patch) | |
| tree | 3846c90989dd9e4c3d4b612106bc0d449c8285d3 | |
| parent | 191e2e84550366cb75d131d96c0755360f0e2109 (diff) | |
| parent | c9f79ca85c96f0f1889bb525d75bb6dd905959d0 (diff) | |
| download | libvpx-89c3da568f5dd9c5935b58a9e1466e46f82dbe35.tar libvpx-89c3da568f5dd9c5935b58a9e1466e46f82dbe35.tar.gz libvpx-89c3da568f5dd9c5935b58a9e1466e46f82dbe35.tar.bz2 libvpx-89c3da568f5dd9c5935b58a9e1466e46f82dbe35.zip | |
Merge "Inlining and removing vp9_set_mbmode_and_mvs()."
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 3 | ||||
| -rw-r--r-- | vp9/encoder/vp9_mbgraph.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 6 | ||||
| -rw-r--r-- | 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 b507c6e7c..d83c4357b 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 d3e19b4b9..652038950 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 ecc3da768..e6e0155d1 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1461,12 +1461,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 b5baa337d..e1a4676a1 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], |