Merge "Make ref-mv experiment support ActiveMap" into nextgenv2

3713949b · Jingning Han · Gerrit Code Review · b85d0ada · 27d8a948 · 3713949b
Commit 3713949b authored Jun 06, 2016 by Jingning Han Committed by Gerrit Code Review Jun 06, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

vp10/encoder/rdopt.c vp10/encoder/rdopt.c +4 -0

No files found.
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -9944,6 +9944,10 @@ void vp10_rd_pick_inter_mode_sb_seg_skip(VP10_COMP *cpi,
  mbmi->ref_frame[0] = LAST_FRAME;
  mbmi->ref_frame[1] = NONE;
  mbmi->mv[0].as_int = 0;
+#if CONFIG_REF_MV
+  mbmi->ref_mv_idx = 0;
+  mbmi->pred_mv[0].as_int = 0;
+#endif
  x->skip = 1;

  if (cm->interp_filter != BILINEAR) {