diff options
| author | James Zern <jzern@google.com> | 2015-06-30 21:12:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-30 21:12:54 +0000 |
| commit | fc5f3b8f4f170a32207ca2eca60f87bb0a01d03c (patch) | |
| tree | 60e029e7e5db4e5deeb62e91281621103f948a93 /vp9/common | |
| parent | e943db045a5ca86389c3a41a1b7b7b0e16e71986 (diff) | |
| parent | 28a8226350f24404b77127a258debf2136edada8 (diff) | |
| download | libvpx-fc5f3b8f4f170a32207ca2eca60f87bb0a01d03c.tar libvpx-fc5f3b8f4f170a32207ca2eca60f87bb0a01d03c.tar.gz libvpx-fc5f3b8f4f170a32207ca2eca60f87bb0a01d03c.tar.bz2 libvpx-fc5f3b8f4f170a32207ca2eca60f87bb0a01d03c.zip | |
Merge "vp9_common_data: right-size tables"
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_common_data.c | 18 | ||||
| -rw-r--r-- | vp9/common/vp9_common_data.h | 19 |
2 files changed, 19 insertions, 18 deletions
diff --git a/vp9/common/vp9_common_data.c b/vp9/common/vp9_common_data.c index 2aaa009fa..0bf7cbcc0 100644 --- a/vp9/common/vp9_common_data.c +++ b/vp9/common/vp9_common_data.c @@ -11,27 +11,27 @@ #include "vp9/common/vp9_common_data.h" // Log 2 conversion lookup tables for block width and height -const int b_width_log2_lookup[BLOCK_SIZES] = +const uint8_t 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_SIZES] = +const uint8_t 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_SIZES] = +const uint8_t 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_SIZES] = +const uint8_t 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_SIZES] = +const uint8_t 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] = +const uint8_t num_8x8_blocks_wide_lookup[BLOCK_SIZES] = {1, 1, 1, 1, 1, 2, 2, 2, 4, 4, 4, 8, 8}; -const int num_8x8_blocks_high_lookup[BLOCK_SIZES] = +const uint8_t 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_SIZES] = +const uint8_t 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_SIZES] = +const uint8_t 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_SIZES] = { diff --git a/vp9/common/vp9_common_data.h b/vp9/common/vp9_common_data.h index a06c9bed8..95a117961 100644 --- a/vp9/common/vp9_common_data.h +++ b/vp9/common/vp9_common_data.h @@ -12,20 +12,21 @@ #define VP9_COMMON_VP9_COMMON_DATA_H_ #include "vp9/common/vp9_enums.h" +#include "vpx/vpx_integer.h" #ifdef __cplusplus extern "C" { #endif -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 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]; -extern const int num_4x4_blocks_wide_lookup[BLOCK_SIZES]; -extern const int size_group_lookup[BLOCK_SIZES]; -extern const int num_pels_log2_lookup[BLOCK_SIZES]; +extern const uint8_t b_width_log2_lookup[BLOCK_SIZES]; +extern const uint8_t b_height_log2_lookup[BLOCK_SIZES]; +extern const uint8_t mi_width_log2_lookup[BLOCK_SIZES]; +extern const uint8_t num_8x8_blocks_wide_lookup[BLOCK_SIZES]; +extern const uint8_t num_8x8_blocks_high_lookup[BLOCK_SIZES]; +extern const uint8_t num_4x4_blocks_high_lookup[BLOCK_SIZES]; +extern const uint8_t num_4x4_blocks_wide_lookup[BLOCK_SIZES]; +extern const uint8_t size_group_lookup[BLOCK_SIZES]; +extern const uint8_t num_pels_log2_lookup[BLOCK_SIZES]; extern const PARTITION_TYPE partition_lookup[][BLOCK_SIZES]; extern const BLOCK_SIZE subsize_lookup[PARTITION_TYPES][BLOCK_SIZES]; extern const TX_SIZE max_txsize_lookup[BLOCK_SIZES]; |