Index: source/libvpx/vp9/common/vp9_common_data.h |
=================================================================== |
--- source/libvpx/vp9/common/vp9_common_data.h (revision 219822) |
+++ source/libvpx/vp9/common/vp9_common_data.h (working copy) |
@@ -13,21 +13,20 @@ |
#include "vp9/common/vp9_enums.h" |
-extern const int b_width_log2_lookup[BLOCK_SIZE_TYPES]; |
-extern const int b_height_log2_lookup[BLOCK_SIZE_TYPES]; |
-extern const int mi_width_log2_lookup[BLOCK_SIZE_TYPES]; |
-extern const int mi_height_log2_lookup[BLOCK_SIZE_TYPES]; |
-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 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]; |
+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 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]; |
+extern const TX_SIZE max_uv_txsize_lookup[BLOCK_SIZES]; |
+extern const BLOCK_SIZE ss_size_lookup[BLOCK_SIZES][2][2]; |
- |
-extern const BLOCK_SIZE_TYPE subsize_lookup[PARTITION_TYPES][BLOCK_SIZE_TYPES]; |
-extern const TX_SIZE max_txsize_lookup[BLOCK_SIZE_TYPES]; |
-extern const TX_SIZE max_uv_txsize_lookup[BLOCK_SIZE_TYPES]; |
-extern const BLOCK_SIZE_TYPE bsize_from_dim_lookup[5][5]; |
- |
#endif // VP9_COMMON_VP9_COMMON_DATA_H |