diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index c6af7f6da8fe0dd51013e158b102b0af324765b1..21e2b16a40b70596ec05a62aeef421bf1434a5fd 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -115,10 +115,6 @@ static INLINE int mi_width_log2(BLOCK_SIZE sb_type) { return mi_width_log2_lookup[sb_type]; } -static INLINE int mi_height_log2(BLOCK_SIZE sb_type) { - return mi_height_log2_lookup[sb_type]; -} - // This structure now relates to 8x8 block regions. typedef struct { MB_PREDICTION_MODE mode, uv_mode; diff --git a/vp9/common/vp9_common_data.c b/vp9/common/vp9_common_data.c index 886c0afc6bca2f59e9a2503cf05308cfdc3bc4ee..a927823e04b8c8be2c064734bc69a78e93795351 100644 --- a/vp9/common/vp9_common_data.c +++ b/vp9/common/vp9_common_data.c @@ -26,8 +26,6 @@ const int mi_width_log2_lookup[BLOCK_SIZES] = {0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3}; const int num_8x8_blocks_wide_lookup[BLOCK_SIZES] = {1, 1, 1, 1, 1, 2, 2, 2, 4, 4, 4, 8, 8}; -const int mi_height_log2_lookup[BLOCK_SIZES] = - {0, 0, 0, 0, 1, 0, 1, 2, 1, 2, 3, 2, 3}; const int num_8x8_blocks_high_lookup[BLOCK_SIZES] = {1, 1, 1, 1, 2, 1, 2, 4, 2, 4, 8, 4, 8}; diff --git a/vp9/common/vp9_common_data.h b/vp9/common/vp9_common_data.h index a367c65c63fb33df87c89c59148c1bdc3868319c..5222d29c170fd7ecf292fde218e60e5f17d4b014 100644 --- a/vp9/common/vp9_common_data.h +++ b/vp9/common/vp9_common_data.h @@ -16,7 +16,6 @@ extern const int b_width_log2_lookup[BLOCK_SIZES]; extern const int b_height_log2_lookup[BLOCK_SIZES]; extern const int mi_width_log2_lookup[BLOCK_SIZES]; -extern const int mi_height_log2_lookup[BLOCK_SIZES]; extern const int num_8x8_blocks_wide_lookup[BLOCK_SIZES]; extern const int num_8x8_blocks_high_lookup[BLOCK_SIZES]; extern const int num_4x4_blocks_high_lookup[BLOCK_SIZES]; diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index b5ed959e139ea63ac7b97c180ca605fbfd102304..f6fe4d3f1871e2398c06f7e843f4e70b92d18b28 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -346,7 +346,7 @@ static INLINE int partition_plane_context( const int bs = 1 << bsl; int above = 0, left = 0, i; - assert(mi_width_log2(bsize) == mi_height_log2(bsize)); + assert(b_width_log2(bsize) == b_height_log2(bsize)); assert(bsl >= 0); for (i = 0; i < bs; i++) {