[NORMATIVE]Fix has_top_right() for 128x* blocks Before this fix, have_top_right for the complete right half of the sb128 is disabled. Borg test results don't show any compression changes. Probably 128x* blocks are very rarely chosen for intra modes. BUG=aomedia:1309 Change-Id: I66a0573c029e7e3d440014842b5d031190d89f89
diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c index b9d266f..72f3744 100644 --- a/av1/common/reconintra.c +++ b/av1/common/reconintra.c
@@ -273,9 +273,11 @@ if (row_off > 0) { // Just need to check if enough pixels on the right. #if CONFIG_EXT_PARTITION - if (col_off + top_right_count_unit >= - (block_size_wide[BLOCK_64X64] >> (tx_size_wide_log2[0] + ss_x))) - return 0; + if (block_size_wide[bsize] > block_size_wide[BLOCK_64X64]) { + const int plane_bw_unit_64 = mi_size_wide[BLOCK_64X64] >> ss_x; + const int col_off_64 = col_off % plane_bw_unit_64; + return col_off_64 + top_right_count_unit < plane_bw_unit_64; + } #endif return col_off + top_right_count_unit < plane_bw_unit; } else {