commit 91ad0e8b836f25f2b07216d28f32561b99954c6f
author Jingning Han <jingning@google.com> Wed Dec 07 17:59:32 2016 -0800
committer Jingning Han <jingning@google.com> Thu Dec 08 20:25:42 2016 +0000
tree d5d38eff942e3eed3993c6129581fcec8e93f3ec
parent ff17e16ca897670e99b8a342248f4370f8c59c07

Retain mb_rows/cols/ as 16x16 block count

Change-Id: I3d0605a314fbd469133c96c76340396810242ada

av1/common/alloccommon.c

diff --git a/av1/common/alloccommon.c b/av1/common/alloccommon.c
index fd5ce5a..9930da3 100644
--- a/av1/common/alloccommon.c
+++ b/av1/common/alloccommon.c
@@ -26,8 +26,13 @@
   cm->mi_rows = aligned_height >> MI_SIZE_LOG2;
   cm->mi_stride = calc_mi_size(cm->mi_cols);
 
+#if CONFIG_CB4X4
+  cm->mb_cols = (cm->mi_cols + 2) >> 2;
+  cm->mb_rows = (cm->mi_rows + 2) >> 2;
+#else
   cm->mb_cols = (cm->mi_cols + 1) >> 1;
   cm->mb_rows = (cm->mi_rows + 1) >> 1;
+#endif
   cm->MBs = cm->mb_rows * cm->mb_cols;
 }