From 96be0a50abf06223f9c297866c7d56e56ce00453 Mon Sep 17 00:00:00 2001
From: Dmitry Kovalev <dkovalev@google.com>
Date: Fri, 10 Jan 2014 13:29:47 -0800
Subject: [PATCH] Removing mi_height_log2_lookup table.
Change-Id: I1f0ae2edc3a96b33c0494d165ae756a8feba6184
---
vp9/common/vp9_blockd.h | 4 ----
vp9/common/vp9_common_data.c | 2 --
vp9/common/vp9_common_data.h | 1 -
vp9/common/vp9_onyxc_int.h | 2 +-
4 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index c6af7f6da8..21e2b16a40 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 886c0afc6b..a927823e04 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 a367c65c63..5222d29c17 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 b5ed959e13..f6fe4d3f18 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++) {
--
GitLab