diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2013-07-08 14:54:04 -0700 |
---|---|---|
committer | Dmitry Kovalev <dkovalev@google.com> | 2013-07-08 14:54:04 -0700 |
commit | b7559258a45e4ad67cc492ca02e3c45319bd843e (patch) | |
tree | d5eb393910f068a784c9722d5f599bc5833e7b82 /vp9/common/vp9_enums.h | |
parent | a38cf2658a57e1da7bdc193afbd5471347db154d (diff) | |
download | libvpx-b7559258a45e4ad67cc492ca02e3c45319bd843e.tar libvpx-b7559258a45e4ad67cc492ca02e3c45319bd843e.tar.gz libvpx-b7559258a45e4ad67cc492ca02e3c45319bd843e.tar.bz2 libvpx-b7559258a45e4ad67cc492ca02e3c45319bd843e.zip |
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
Diffstat (limited to 'vp9/common/vp9_enums.h')
-rw-r--r-- | vp9/common/vp9_enums.h | 8 |
1 files changed, 5 insertions, 3 deletions
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, |