From 1167fd9e77fa35e20eb859e988905c6842ef762e Mon Sep 17 00:00:00 2001
From: Jingning Han <jingning@google.com>
Date: Fri, 3 Jun 2016 12:12:58 -0700
Subject: [PATCH] Fix ActiveMap failure in ref-mv scheme

Reset the ref_mv_idx and predicted motion vector when the coding
block belongs to skip segment.

Change-Id: I416545f1648fef5b537afa25de469f54c49a86ed
---
 av1/encoder/rdopt.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 10778601c..162d54c72 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -3830,6 +3830,11 @@ void av1_rd_pick_inter_mode_sb_seg_skip(AV1_COMP *cpi, TileDataEnc *tile_data,
   mbmi->mv[0].as_int = 0;
   x->skip = 1;
 
+#if CONFIG_REF_MV
+  mbmi->ref_mv_idx = 0;
+  mbmi->pred_mv[0].as_int = 0;
+#endif
+
   if (cm->interp_filter != BILINEAR) {
     best_filter = EIGHTTAP;
     if (cm->interp_filter == SWITCHABLE &&
-- 
GitLab