Commit d621f9bb authored by Frederic Barbier's avatar Frederic Barbier Committed by Frédéric BARBIER

Cleanup useless marker entry in tx_size_2d

This extra entry has been introduced in 3ebb0d00
but is not needed.

Change-Id: I22801b2a0677dd5c381175f2fc6d9e86dde1594e
parent 96d7a686
...@@ -845,20 +845,20 @@ static const int tx_size_high_log2[TX_SIZES_ALL] = { ...@@ -845,20 +845,20 @@ static const int tx_size_high_log2[TX_SIZES_ALL] = {
#define TX_UNIT_WIDE_LOG2 (MI_SIZE_LOG2 - tx_size_wide_log2[0]) #define TX_UNIT_WIDE_LOG2 (MI_SIZE_LOG2 - tx_size_wide_log2[0])
#define TX_UNIT_HIGH_LOG2 (MI_SIZE_LOG2 - tx_size_high_log2[0]) #define TX_UNIT_HIGH_LOG2 (MI_SIZE_LOG2 - tx_size_high_log2[0])
static const int tx_size_2d[TX_SIZES_ALL + 1] = { 16, 64, 256, 1024, static const int tx_size_2d[TX_SIZES_ALL + 1] = {
16, 64, 256, 1024,
#if CONFIG_TX64X64 #if CONFIG_TX64X64
4096, 4096,
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
32, 32, 128, 128, 32, 32, 128, 128, 512, 512,
512, 512,
#if CONFIG_TX64X64 #if CONFIG_TX64X64
2048, 2048, 2048, 2048,
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
64, 64, 256, 256, 64, 64, 256, 256,
#if CONFIG_TX64X64 #if CONFIG_TX64X64
1024, 1024, 1024, 1024,
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
32767 }; };
static const BLOCK_SIZE txsize_to_bsize[TX_SIZES_ALL] = { static const BLOCK_SIZE txsize_to_bsize[TX_SIZES_ALL] = {
BLOCK_4X4, // TX_4X4 BLOCK_4X4, // TX_4X4
......
...@@ -207,7 +207,12 @@ typedef enum ATTRIBUTE_PACKED { ...@@ -207,7 +207,12 @@ typedef enum ATTRIBUTE_PACKED {
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
TX_SIZES_ALL, // Includes rectangular transforms TX_SIZES_ALL, // Includes rectangular transforms
TX_SIZES = TX_4X8, // Does NOT include rectangular transforms TX_SIZES = TX_4X8, // Does NOT include rectangular transforms
TX_INVALID = 255 // Invalid transform size #if CONFIG_TX64X64
TX_SIZES_LARGEST = TX_64X64,
#else
TX_SIZES_LARGEST = TX_32X32,
#endif
TX_INVALID = 255 // Invalid transform size
#if defined(_MSC_VER) #if defined(_MSC_VER)
}; };
#else #else
......
...@@ -973,7 +973,7 @@ static void read_intrabc_info(AV1_COMMON *const cm, MACROBLOCKD *const xd, ...@@ -973,7 +973,7 @@ static void read_intrabc_info(AV1_COMMON *const cm, MACROBLOCKD *const xd,
const TX_SIZE max_tx_size = get_max_rect_tx_size(bsize, 0); const TX_SIZE max_tx_size = get_max_rect_tx_size(bsize, 0);
const int bh = tx_size_high_unit[max_tx_size]; const int bh = tx_size_high_unit[max_tx_size];
const int bw = tx_size_wide_unit[max_tx_size]; const int bw = tx_size_wide_unit[max_tx_size];
mbmi->min_tx_size = TX_SIZES_ALL; mbmi->min_tx_size = TX_SIZES_LARGEST;
for (int idy = 0; idy < height; idy += bh) { for (int idy = 0; idy < height; idy += bh) {
for (int idx = 0; idx < width; idx += bw) { for (int idx = 0; idx < width; idx += bw) {
read_tx_size_vartx(cm, xd, mbmi, xd->counts, max_tx_size, 0, idy, idx, read_tx_size_vartx(cm, xd, mbmi, xd->counts, max_tx_size, 0, idy, idx,
...@@ -2245,7 +2245,7 @@ static void read_inter_frame_mode_info(AV1Decoder *const pbi, ...@@ -2245,7 +2245,7 @@ static void read_inter_frame_mode_info(AV1Decoder *const pbi,
const int width = block_size_wide[bsize] >> tx_size_wide_log2[0]; const int width = block_size_wide[bsize] >> tx_size_wide_log2[0];
const int height = block_size_high[bsize] >> tx_size_wide_log2[0]; const int height = block_size_high[bsize] >> tx_size_wide_log2[0];
mbmi->min_tx_size = TX_SIZES_ALL; mbmi->min_tx_size = TX_SIZES_LARGEST;
for (int idy = 0; idy < height; idy += bh) for (int idy = 0; idy < height; idy += bh)
for (int idx = 0; idx < width; idx += bw) for (int idx = 0; idx < width; idx += bw)
read_tx_size_vartx(cm, xd, mbmi, xd->counts, max_tx_size, 0, idy, idx, read_tx_size_vartx(cm, xd, mbmi, xd->counts, max_tx_size, 0, idy, idx,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment