shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removing mi_height_log2_lookup table."

--- a/vp9/common/vp9_blockd.h

+++ b/vp9/common/vp9_blockd.h

@@ -115,10 +115,6 @@

   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;

--- a/vp9/common/vp9_common_data.c

+++ b/vp9/common/vp9_common_data.c

@@ -26,8 +26,6 @@

   {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};

--- 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];

--- a/vp9/common/vp9_onyxc_int.h

+++ b/vp9/common/vp9_onyxc_int.h

@@ -346,7 +346,7 @@

   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++) {