diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-07-25 13:57:28 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-25 13:57:28 -0700 |
| commit | d53fc9ee4e56212f7e42cbaa4f0c99b8d443d602 (patch) | |
| tree | 327dff61c2030529889ef8aa012d861be5865b9d /vp9/common | |
| parent | e862c6f9eb2ed9316b904685a5173a5062770a63 (diff) | |
| parent | 08fd41ccd70214c58aa436add4c955ad7c0af58c (diff) | |
| download | libvpx-d53fc9ee4e56212f7e42cbaa4f0c99b8d443d602.tar libvpx-d53fc9ee4e56212f7e42cbaa4f0c99b8d443d602.tar.gz libvpx-d53fc9ee4e56212f7e42cbaa4f0c99b8d443d602.tar.bz2 libvpx-d53fc9ee4e56212f7e42cbaa4f0c99b8d443d602.zip | |
Merge "Adding lookup table for size group."
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_common_data.c | 5 | ||||
| -rw-r--r-- | vp9/common/vp9_common_data.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/vp9/common/vp9_common_data.c b/vp9/common/vp9_common_data.c index dee44ec63..7cd302a30 100644 --- a/vp9/common/vp9_common_data.c +++ b/vp9/common/vp9_common_data.c @@ -31,6 +31,11 @@ const int mi_height_log2_lookup[BLOCK_SIZE_TYPES] = const int num_8x8_blocks_high_lookup[BLOCK_SIZE_TYPES] = {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] = + {0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3}; + + const PARTITION_TYPE partition_lookup[][BLOCK_SIZE_TYPES] = { { // 4X4 // 4X4, 4X8,8X4,8X8,8X16,16X8,16X16,16X32,32X16,32X32,32X64,64X32,64X64 diff --git a/vp9/common/vp9_common_data.h b/vp9/common/vp9_common_data.h index 8b0f8a500..44ec7ae75 100644 --- a/vp9/common/vp9_common_data.h +++ b/vp9/common/vp9_common_data.h @@ -21,8 +21,9 @@ extern const int num_8x8_blocks_wide_lookup[BLOCK_SIZE_TYPES]; extern const int num_8x8_blocks_high_lookup[BLOCK_SIZE_TYPES]; extern const int num_4x4_blocks_high_lookup[BLOCK_SIZE_TYPES]; extern const int num_4x4_blocks_wide_lookup[BLOCK_SIZE_TYPES]; -extern const PARTITION_TYPE - partition_lookup[][BLOCK_SIZE_TYPES]; +extern const int size_group_lookup[BLOCK_SIZE_TYPES]; + +extern const PARTITION_TYPE partition_lookup[][BLOCK_SIZE_TYPES]; extern const BLOCK_SIZE_TYPE subsize_lookup[PARTITION_TYPES][BLOCK_SIZE_TYPES]; |