From b7559258a45e4ad67cc492ca02e3c45319bd843e Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Mon, 8 Jul 2013 14:54:04 -0700 Subject: Using mi_cols instead of mb_cols. Eliminating usage of mb-units, switching to mi-units. Adding ALIGN_POWER_OF_TWO macro. Change-Id: I2491c969f713207c062011878b57e4e531818607 --- vp9/common/vp9_enums.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'vp9/common/vp9_enums.h') diff --git a/vp9/common/vp9_enums.h b/vp9/common/vp9_enums.h index 89a925397..dfd6a4a3f 100644 --- a/vp9/common/vp9_enums.h +++ b/vp9/common/vp9_enums.h @@ -14,10 +14,12 @@ #include "./vpx_config.h" #define LOG2_MI_SIZE 3 +#define LOG2_MI_BLOCK_SIZE (6 - LOG2_MI_SIZE) // 64 = 2^6 -#define MI_SIZE (1 << LOG2_MI_SIZE) -#define MI_MASK ((64 >> LOG2_MI_SIZE) - 1) -#define MI_BLOCK_SIZE (64 / MI_SIZE) +#define MI_SIZE (1 << LOG2_MI_SIZE) // pixels per mi-unit +#define MI_BLOCK_SIZE (1 << LOG2_MI_BLOCK_SIZE) // mi-units per max block + +#define MI_MASK (MI_BLOCK_SIZE - 1) typedef enum BLOCK_SIZE_TYPE { BLOCK_SIZE_AB4X4, -- cgit v1.2.3