commit 91f01fdf9bf50a3438ea6aad453804d0854bb568
author Jingning Han <jingning@google.com> Wed Jan 18 17:16:40 2017 -0800
committer Jingning Han <jingning@google.com> Thu Jan 19 05:31:32 2017 +0000
tree b8eb0059aeaf4d3de6d8be3f776b59e82ebd31e4
parent 51ec505c8f179c0e21b48f1fca658fafae1599b9

Support non-causal obmc in the cb4x4 mode

Make non-causal obmc option works in the cb4x4 mode.

Change-Id: If470ab61166752efc72719f9cd3e440560de1d51

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index afa3bd3..a06264d 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -1650,7 +1650,7 @@
                              int mi_row, int mi_col, BLOCK_SIZE bsize,
                              PC_TREE *pc_tree) {
   const AV1_COMMON *const cm = &cpi->common;
-  const int bsl = b_width_log2_lookup[bsize], hbs = (1 << bsl) / 4;
+  const int hbs = mi_size_wide[bsize] / 2;
   const PARTITION_TYPE partition = pc_tree->partitioning;
   BLOCK_SIZE subsize = get_subsize(bsize, partition);
 #if CONFIG_EXT_PARTITION_TYPES