commit 8570b35d64e75f60f5c5939c0f87bacbbcc72743
author Jingning Han <jingning@google.com> Wed Dec 14 11:05:10 2016 -0800
committer Jingning Han <jingning@google.com> Thu Dec 15 05:07:02 2016 +0000
tree 22babda56c9426e419451e8816c982d8b36a8638
parent b46540ca2b1a95b45c5bf38f2ae2f96322aacfec

Streamline reference motion vector search for all block sizes

Take out the functions set for sub8x8 block sizes.

Change-Id: I15836df44051f2c8679c317d52eab9ef55fb5b17

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 564e41a..47d34c0 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -22,6 +22,11 @@
     CANDIDATE_MV *ref_mv_stack, const int use_hp, int len, int block, int col) {
   int index = 0, ref;
   int newmv_count = 0;
+#if CONFIG_CB4X4
+  const int unify_bsize = 1;
+#else
+  const int unify_bsize = 0;
+#endif
 
   if (rf[1] == NONE) {
     // single reference frame
@@ -51,7 +56,8 @@
             ++newmv_count;
         }
 
-        if (candidate_mi->mbmi.sb_type < BLOCK_8X8 && block >= 0) {
+        if (candidate_mi->mbmi.sb_type < BLOCK_8X8 && block >= 0 &&
+            !unify_bsize) {
           int alt_block = 3 - block;
           this_refmv = get_sub_block_mv(candidate_mi, ref, col, alt_block);
           lower_mv_precision(&this_refmv.as_mv, use_hp);
@@ -116,7 +122,8 @@
           ++newmv_count;
       }
 
-      if (candidate_mi->mbmi.sb_type < BLOCK_8X8 && block >= 0) {
+      if (candidate_mi->mbmi.sb_type < BLOCK_8X8 && block >= 0 &&
+          !unify_bsize) {
         int alt_block = 3 - block;
         this_refmv[0] = get_sub_block_mv(candidate_mi, 0, col, alt_block);
         this_refmv[1] = get_sub_block_mv(candidate_mi, 1, col, alt_block);

av1/common/mvref_common.h

diff --git a/av1/common/mvref_common.h b/av1/common/mvref_common.h
index d62eba6..94b256b 100644
--- a/av1/common/mvref_common.h
+++ b/av1/common/mvref_common.h
@@ -425,9 +425,13 @@
 
   if (block >= 0) {
     mode_ctx = mode_context[rf[0]] & 0x00ff;
-
+#if !CONFIG_CB4X4
     if (block > 0 && bsize < BLOCK_8X8 && bsize > BLOCK_4X4)
       mode_ctx |= (1 << SKIP_NEARESTMV_SUB8X8_OFFSET);
+#else
+    (void)block;
+    (void)bsize;
+#endif
 
     return mode_ctx;
   }