commit e3afdd8949c55dcc84ac9f95f1b48a54fb8bb257
author David Barker <david.barker@argondesign.com> Fri Jun 30 17:08:11 2017 +0100
committer Debargha Mukherjee <debargha@google.com> Fri Jun 30 21:50:49 2017 +0000
tree fa5aec72c64dfade6fba5c8a03f23ded352a222e
parent 161e3392683507fa57be47b6c151c74e86d8b1be

Fix bug when cb4x4 is disabled

When cb4x4 is disabled and global-motion is enabled, the function
av1_append_sub8x8_mvs_for_idx accidentally fetched
cm->global_motion[ref] instead of cm->global_motion[rf[0]],
ie. it used the reference *index* instead of the reference *frame*.

Change-Id: Ieebf60f6b7c0a1cbbc083a70d4451ad799e27fe3

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 77cd715..afc78c0 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -929,10 +929,10 @@
   assert(MAX_MV_REF_CANDIDATES == 2);
 
 #if CONFIG_GLOBAL_MOTION
-  zeromv.as_int =
-      gm_get_motion_vector(&cm->global_motion[ref], cm->allow_high_precision_mv,
-                           mi->mbmi.sb_type, mi_col, mi_row, block)
-          .as_int;
+  zeromv.as_int = gm_get_motion_vector(&cm->global_motion[rf[0]],
+                                       cm->allow_high_precision_mv,
+                                       mi->mbmi.sb_type, mi_col, mi_row, block)
+                      .as_int;
 #else
   zeromv.as_int = 0;
 #endif