commit 7d5559ccc23ebb41f66ef334d1cef95b3b2ce454
author Alex Converse <aconverse@google.com> Wed Jun 14 12:32:35 2017 -0700
committer Alex Converse <aconverse@google.com> Thu Jun 15 16:39:06 2017 +0000
tree aa3401c7f69aa1ecfcac9affe5346b6df8cfe8fb
parent 639a9ebacf8aff693ad96b26ec66a4d19caf6d8f

intrabc: Fix compatibility with global motion

Change-Id: I64ec8d3b67db10b2d2d1cc130f845baf26d122c2

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index d558111..77cd715 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -840,17 +840,21 @@
 #endif  // CONFIG_EXT_INTER
 
 #if CONFIG_GLOBAL_MOTION
-  av1_set_ref_frame(rf, ref_frame);
-  zeromv[0].as_int = gm_get_motion_vector(&cm->global_motion[rf[0]],
-                                          cm->allow_high_precision_mv, bsize,
-                                          mi_col, mi_row, 0)
-                         .as_int;
-  zeromv[1].as_int = (rf[1] != NONE_FRAME)
-                         ? gm_get_motion_vector(&cm->global_motion[rf[1]],
-                                                cm->allow_high_precision_mv,
-                                                bsize, mi_col, mi_row, 0)
-                               .as_int
-                         : 0;
+  if (!CONFIG_INTRABC || ref_frame != INTRA_FRAME) {
+    av1_set_ref_frame(rf, ref_frame);
+    zeromv[0].as_int = gm_get_motion_vector(&cm->global_motion[rf[0]],
+                                            cm->allow_high_precision_mv, bsize,
+                                            mi_col, mi_row, 0)
+                           .as_int;
+    zeromv[1].as_int = (rf[1] != NONE_FRAME)
+                           ? gm_get_motion_vector(&cm->global_motion[rf[1]],
+                                                  cm->allow_high_precision_mv,
+                                                  bsize, mi_col, mi_row, 0)
+                                 .as_int
+                           : 0;
+  } else {
+    zeromv[0].as_int = zeromv[1].as_int = 0;
+  }
 #else
   zeromv[0].as_int = zeromv[1].as_int = 0;
 #endif  // CONFIG_GLOBAL_MOTION