commit ab68ddb3133ec900c3506f2f218f4a9e0fb67623
author Debargha Mukherjee <debargha@google.com> Thu Oct 19 21:16:54 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Sat Oct 21 00:23:37 2017 +0000
tree dcfb3a94921d0abc7c92c206c4e2ed7fec52d353
parent edced25af70643f0e1c11262856e2f8c5ab38958

Re-enable 16x4 and 4x16 partitons,

Disable corresponding 2x8 and 8x2 chroma inter predicitons for
chroma temporarily.

Change-Id: I7caf8da303d9231534e960fde1a5639cf9820635

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index a042940..eff931a 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -3153,12 +3153,10 @@
   // subsample to 16x2, which doesn't have an enum. Also, there's no BLOCK_8X2
   // or BLOCK_2X8, so we can't do 4:1 or 1:4 partitions for BLOCK_16X16 if there
   // is any subsampling.
-  const int horz4_partition_allowed = ext_partition_allowed &&
-                                      partition_horz_allowed && yss <= xss &&
-                                      (xss == 0 || bsize > BLOCK_16X16);
-  const int vert4_partition_allowed = ext_partition_allowed &&
-                                      partition_vert_allowed && xss <= yss &&
-                                      (yss == 0 || bsize > BLOCK_16X16);
+  const int horz4_partition_allowed =
+      ext_partition_allowed && partition_horz_allowed;
+  const int vert4_partition_allowed =
+      ext_partition_allowed && partition_vert_allowed;
 
 #if CONFIG_EXT_PARTITION_TYPES_AB
   // The alternative AB partitions are allowed iff the corresponding 4:1