diff --git a/av1/common/common_data.h b/av1/common/common_data.h index 3acb58e01..4f799dba9 100644 --- a/av1/common/common_data.h +++ b/av1/common/common_data.h @@ -67,62 +67,6 @@ static const uint8_t num_16x16_blocks_high_lookup[BLOCK_SIZES] = { 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 4, 2, 4, IF_EXT_PARTITION(8, 4, 8) }; -static const uint8_t num_4x4_blocks_txsize_lookup[TX_SIZES_ALL] = { -#if CONFIG_CB4X4 - 1, -#endif - 1, 4, 16, 64, -#if CONFIG_EXT_TX - 2, 2, 8, 8, 32, 32 -#endif // CONFIG_EXT_TX -}; -static const uint8_t num_4x4_blocks_wide_txsize_lookup[TX_SIZES_ALL] = { -#if CONFIG_CB4X4 - 1, -#endif - 1, 2, 4, 8, -#if CONFIG_EXT_TX - 1, 2, 2, 4, 4, 8 -#endif // CONFIG_EXT_TX -}; -static const uint8_t num_4x4_blocks_high_txsize_lookup[TX_SIZES_ALL] = { -#if CONFIG_CB4X4 - 1, -#endif - 1, 2, 4, 8, -#if CONFIG_EXT_TX - 2, 1, 4, 2, 8, 4 -#endif // CONFIG_EXT_TX -}; - -static const uint8_t num_4x4_blocks_txsize_log2_lookup[TX_SIZES_ALL] = { -#if CONFIG_CB4X4 - 0, -#endif - 0, 2, 4, 6, -#if CONFIG_EXT_TX - 1, 1, 3, 3, 5, 5 -#endif // CONFIG_EXT_TX -}; -static const uint8_t num_4x4_blocks_wide_txsize_log2_lookup[TX_SIZES_ALL] = { -#if CONFIG_CB4X4 - 0, -#endif - 0, 1, 2, 3, -#if CONFIG_EXT_TX - 0, 1, 1, 2, 2, 3 -#endif // CONFIG_EXT_TX -}; -static const uint8_t num_4x4_blocks_high_txsize_log2_lookup[TX_SIZES_ALL] = { -#if CONFIG_CB4X4 - 0, -#endif - 0, 1, 2, 3, -#if CONFIG_EXT_TX - 1, 0, 2, 1, 3, 2 -#endif // CONFIG_EXT_TX -}; - // AOMMIN(3, AOMMIN(b_width_log2(bsize), b_height_log2(bsize))) static const uint8_t size_group_lookup[BLOCK_SIZES] = { 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3, IF_EXT_PARTITION(3, 3, 3)