commit b46540ca2b1a95b45c5bf38f2ae2f96322aacfec
author Jingning Han <jingning@google.com> Wed Dec 14 10:59:20 2016 -0800
committer Jingning Han <jingning@google.com> Thu Dec 15 05:07:02 2016 +0000
tree fb12d8a31c90361c0e7f45733ba63e961f0f2d9b
parent bf1d62dd2ffd5abefb04d62f19acf4427ca408c8

Simplify motion compensated predictor logic

No need of special handle on sub8x8 block sizes.

Change-Id: I8487cd68eda0882fe50550af3998dc941ec13b21

av1/common/reconinter.h

diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h
index db0b697..da6a4d6 100644
--- a/av1/common/reconinter.h
+++ b/av1/common/reconinter.h
@@ -428,8 +428,13 @@
   const BLOCK_SIZE bsize = mbmi->sb_type;
   int plane;
   int ref = (dir >> 1);
+#if CONFIG_CB4X4
+  const int unify_bsize = 1;
+#else
+  const int unify_bsize = 0;
+#endif
 
-  if (bsize >= BLOCK_8X8) {
+  if (bsize >= BLOCK_8X8 || unify_bsize) {
     if (dir & 0x01) {
       if (mbmi->mv[ref].as_mv.col & SUBPEL_MASK) return 1;
     } else {