diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-10 16:00:56 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-10 16:00:56 -0800 |
| commit | aea286447199642e1ec6b5d6e403319a5c27f716 (patch) | |
| tree | 050a132a734f390d1a9abdb3d94a41b06efc5177 | |
| parent | 6439aa5a0e5b8cd165280041b08d18da22761f8a (diff) | |
| parent | 96be0a50abf06223f9c297866c7d56e56ce00453 (diff) | |
| download | libvpx-aea286447199642e1ec6b5d6e403319a5c27f716.tar libvpx-aea286447199642e1ec6b5d6e403319a5c27f716.tar.gz libvpx-aea286447199642e1ec6b5d6e403319a5c27f716.tar.bz2 libvpx-aea286447199642e1ec6b5d6e403319a5c27f716.zip | |
Merge "Removing mi_height_log2_lookup table."
| -rw-r--r-- | vp9/common/vp9_blockd.h | 4 | ||||
| -rw-r--r-- | vp9/common/vp9_common_data.c | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_common_data.h | 1 | ||||
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 2 |
4 files changed, 1 insertions, 8 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index c6af7f6da..21e2b16a4 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 886c0afc6..a927823e0 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 a367c65c6..5222d29c1 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 b5ed959e1..f6fe4d3f1 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++) { |