Retain mb_rows/cols/ as 16x16 block count

Change-Id: I3d0605a314fbd469133c96c76340396810242ada

Retain mb_rows/cols/ as 16x16 block count
Change-Id: I3d0605a314fbd469133c96c76340396810242ada
91ad0e8b · Jingning Han · ff17e16c · 91ad0e8b
Commit 91ad0e8b authored Dec 07, 2016 by Jingning Han
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

av1/common/alloccommon.c av1/common/alloccommon.c +5 -0

No files found.
--- a/av1/common/alloccommon.c
+++ b/av1/common/alloccommon.c
@@ -26,8 +26,13 @@ void av1_set_mb_mi(AV1_COMMON *cm, int width, int height) {
  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;
 }