diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2013-08-09 17:47:32 -0700 |
---|---|---|
committer | Dmitry Kovalev <dkovalev@google.com> | 2013-08-09 17:47:32 -0700 |
commit | 3c43ec206ca9994ff1e4a3ec3c4365e959e39314 (patch) | |
tree | 176ba49d8a6e522bdf71ffdfe363bf238d060280 /vp9/common/vp9_common_data.c | |
parent | e7c5ca8983b3b59f3f68208038c817798f2be7d5 (diff) | |
download | libvpx-3c43ec206ca9994ff1e4a3ec3c4365e959e39314.tar libvpx-3c43ec206ca9994ff1e4a3ec3c4365e959e39314.tar.gz libvpx-3c43ec206ca9994ff1e4a3ec3c4365e959e39314.tar.bz2 libvpx-3c43ec206ca9994ff1e4a3ec3c4365e959e39314.zip |
Renaming BLOCK_SIZE_TYPES constant to BLOCK_SIZES.
There will be another change set to rename BLOCK_SIZE_TYPE enum to
BLOCK_SIZE.
Change-Id: I8d1dfc873d6186fa5e554262f5169e929978085e
Diffstat (limited to 'vp9/common/vp9_common_data.c')
-rw-r--r-- | vp9/common/vp9_common_data.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/vp9/common/vp9_common_data.c b/vp9/common/vp9_common_data.c index 399391a9f..310a6677b 100644 --- a/vp9/common/vp9_common_data.c +++ b/vp9/common/vp9_common_data.c @@ -13,33 +13,33 @@ #include "vp9/common/vp9_common_data.h" // Log 2 conversion lookup tables for block width and height -const int b_width_log2_lookup[BLOCK_SIZE_TYPES] = +const int b_width_log2_lookup[BLOCK_SIZES] = {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_SIZES] = {0, 1, 0, 1, 2, 1, 2, 3, 2, 3, 4, 3, 4}; -const int num_4x4_blocks_wide_lookup[BLOCK_SIZE_TYPES] = +const int num_4x4_blocks_wide_lookup[BLOCK_SIZES] = {1, 1, 2, 2, 2, 4, 4, 4, 8, 8, 8, 16, 16}; -const int num_4x4_blocks_high_lookup[BLOCK_SIZE_TYPES] = +const int num_4x4_blocks_high_lookup[BLOCK_SIZES] = {1, 2, 1, 2, 4, 2, 4, 8, 4, 8, 16, 8, 16}; // Log 2 conversion lookup tables for modeinfo width and height -const int mi_width_log2_lookup[BLOCK_SIZE_TYPES] = +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_SIZE_TYPES] = +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_SIZE_TYPES] = +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_SIZE_TYPES] = +const int num_8x8_blocks_high_lookup[BLOCK_SIZES] = {1, 1, 1, 1, 2, 1, 2, 4, 2, 4, 8, 4, 8}; // MIN(3, MIN(b_width_log2(bsize), b_height_log2(bsize))) -const int size_group_lookup[BLOCK_SIZE_TYPES] = +const int size_group_lookup[BLOCK_SIZES] = {0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3}; -const int num_pels_log2_lookup[BLOCK_SIZE_TYPES] = +const int num_pels_log2_lookup[BLOCK_SIZES] = {4, 5, 5, 6, 7, 7, 8, 9, 9, 10, 11, 11, 12}; -const PARTITION_TYPE partition_lookup[][BLOCK_SIZE_TYPES] = { +const PARTITION_TYPE partition_lookup[][BLOCK_SIZES] = { { // 4X4 // 4X4, 4X8,8X4,8X8,8X16,16X8,16X16,16X32,32X16,32X32,32X64,64X32,64X64 PARTITION_NONE, PARTITION_INVALID, PARTITION_INVALID, @@ -74,7 +74,7 @@ const PARTITION_TYPE partition_lookup[][BLOCK_SIZE_TYPES] = { } }; -const BLOCK_SIZE_TYPE subsize_lookup[PARTITION_TYPES][BLOCK_SIZE_TYPES] = { +const BLOCK_SIZE_TYPE subsize_lookup[PARTITION_TYPES][BLOCK_SIZES] = { { // PARTITION_NONE BLOCK_4X4, BLOCK_4X8, BLOCK_8X4, BLOCK_8X8, BLOCK_8X16, BLOCK_16X8, @@ -102,20 +102,20 @@ const BLOCK_SIZE_TYPE subsize_lookup[PARTITION_TYPES][BLOCK_SIZE_TYPES] = { } }; -const TX_SIZE max_txsize_lookup[BLOCK_SIZE_TYPES] = { +const TX_SIZE max_txsize_lookup[BLOCK_SIZES] = { TX_4X4, TX_4X4, TX_4X4, TX_8X8, TX_8X8, TX_8X8, TX_16X16, TX_16X16, TX_16X16, TX_32X32, TX_32X32, TX_32X32, TX_32X32 }; -const TX_SIZE max_uv_txsize_lookup[BLOCK_SIZE_TYPES] = { +const TX_SIZE max_uv_txsize_lookup[BLOCK_SIZES] = { TX_4X4, TX_4X4, TX_4X4, TX_4X4, TX_4X4, TX_4X4, TX_8X8, TX_8X8, TX_8X8, TX_16X16, TX_16X16, TX_16X16, TX_32X32 }; -const BLOCK_SIZE_TYPE ss_size_lookup[BLOCK_SIZE_TYPES][2][2] = { +const BLOCK_SIZE_TYPE ss_size_lookup[BLOCK_SIZES][2][2] = { // ss_x == 0 ss_x == 0 ss_x == 1 ss_x == 1 // ss_y == 0 ss_y == 1 ss_y == 0 ss_y == 1 {{BLOCK_4X4, BLOCK_INVALID}, {BLOCK_INVALID, BLOCK_INVALID}}, |