ref: c9f79ca85c96f0f1889bb525d75bb6dd905959d0
parent: 9b57e1edd5039f3d21754ab7208bb63447eb5675
author: Dmitry Kovalev <dkovalev@google.com>
date: Wed Mar 5 06:22:09 EST 2014
Inlining and removing vp9_set_mbmode_and_mvs(). Change-Id: I9717ef611ef9c39b109b2358c9771bf7fae2dd50
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -676,7 +676,8 @@
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;
--- a/vp9/encoder/vp9_mbgraph.c
+++ b/vp9/encoder/vp9_mbgraph.c
@@ -61,7 +61,9 @@
&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 */
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -1463,12 +1463,6 @@
}
}
-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,
--- a/vp9/encoder/vp9_rdopt.h
+++ b/vp9/encoder/vp9_rdopt.h
@@ -77,9 +77,6 @@
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],
--
⑨