commit 598d11fdceedaf362033cc24323d602117540ee7
author Hui Su <huisu@google.com> Fri Apr 27 12:07:39 2018 -0700
committer Yaowu Xu <yaowu@google.com> Mon Apr 30 16:54:48 2018 +0000
tree 086e51df956dd6b506fb0a2c38f25f956f9249e9
parent f7ca93881fc9ce3b7cd4523f0ee15424aa14be69

[Normative]Fix has_top_right() for PARTITION_VERT_4

See details in issue tracker.

BUG=aomedia:1827

Change-Id: If996f42647d7dbc29569179f46d14b5b4b082989

av1/common/onyxc_int.h

diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 237c11e..57d0c00 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -833,8 +833,12 @@
   xd->n8_h = bh;
   xd->n8_w = bw;
   xd->is_sec_rect = 0;
-  if (xd->n8_w < xd->n8_h)
-    if (mi_col & (xd->n8_h - 1)) xd->is_sec_rect = 1;
+  if (xd->n8_w < xd->n8_h) {
+    // Only mark is_sec_rect as 1 for the last block.
+    // For PARTITION_VERT_4, it would be (0, 0, 0, 1);
+    // For other partitions, it would be (0, 1).
+    if (!((mi_col + xd->n8_w) & (xd->n8_h - 1))) xd->is_sec_rect = 1;
+  }
 
   if (xd->n8_w > xd->n8_h)
     if (mi_row & (xd->n8_w - 1)) xd->is_sec_rect = 1;