Commit 863204e6 authored by Jim Bankoski's avatar Jim Bankoski

mi_width_log2 & mi_height_log2

converted to lookup to avoid unnecessary code

Change-Id: I2ee6a01f06984cc2c4ba74b3fffd215318f749d2
parent 6c8170af
...@@ -149,20 +149,11 @@ static INLINE int b_height_log2(BLOCK_SIZE_TYPE sb_type) { ...@@ -149,20 +149,11 @@ static INLINE int b_height_log2(BLOCK_SIZE_TYPE sb_type) {
} }
static INLINE int mi_width_log2(BLOCK_SIZE_TYPE sb_type) { static INLINE int mi_width_log2(BLOCK_SIZE_TYPE sb_type) {
int a = b_width_log2(sb_type) - 1; return mi_width_log2_lookup[sb_type];
// align 4x4 block to mode_info
if (a < 0)
a = 0;
assert(a >= 0);
return a;
} }
static INLINE int mi_height_log2(BLOCK_SIZE_TYPE sb_type) { static INLINE int mi_height_log2(BLOCK_SIZE_TYPE sb_type) {
int a = b_height_log2(sb_type) - 1; return mi_height_log2_lookup[sb_type];
if (a < 0)
a = 0;
assert(a >= 0);
return a;
} }
typedef struct { typedef struct {
......
...@@ -15,3 +15,8 @@ const int b_width_log2_lookup[BLOCK_SIZE_TYPES] = ...@@ -15,3 +15,8 @@ const int b_width_log2_lookup[BLOCK_SIZE_TYPES] =
{0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4}; {0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4};
const int b_height_log2_lookup[BLOCK_SIZE_TYPES] = const int b_height_log2_lookup[BLOCK_SIZE_TYPES] =
{0, 1, 0, 1, 2, 1, 2, 3, 2, 3, 4, 3, 4}; {0, 1, 0, 1, 2, 1, 2, 3, 2, 3, 4, 3, 4};
// Log 2 conversion lookup tables for modeinfo width and height
const int mi_width_log2_lookup[BLOCK_SIZE_TYPES] =
{0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3};
const int mi_height_log2_lookup[BLOCK_SIZE_TYPES] =
{0, 0, 0, 0, 1, 0, 1, 2, 1, 2, 3, 2, 3};
...@@ -15,5 +15,7 @@ ...@@ -15,5 +15,7 @@
extern const int b_width_log2_lookup[BLOCK_SIZE_TYPES]; extern const int b_width_log2_lookup[BLOCK_SIZE_TYPES];
extern const int b_height_log2_lookup[BLOCK_SIZE_TYPES]; extern const int b_height_log2_lookup[BLOCK_SIZE_TYPES];
extern const int mi_width_log2_lookup[BLOCK_SIZE_TYPES];
extern const int mi_height_log2_lookup[BLOCK_SIZE_TYPES];
#endif // VP9_COMMON_VP9_COMMON_DATA_H #endif // VP9_COMMON_VP9_COMMON_DATA_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment