Skip to content

GitLab

Commit aa434238 authored by Jingning Han's avatar Jingning Han
Browse files

Clean up ext-tx experiment 

Remove unnecessary #if statements from the implementation.

Change-Id: I09c2f046aec2c43894f8dcfd99216fdf0a50451d
parent 8fd2d7aa
Hide whitespace changes
Inline Side-by-side
av1/common/blockd.h
View file @ aa434238
......@@ -822,12 +822,8 @@ static INLINE TX_TYPE get_tx_type(PLANE_TYPE plane_type, const MACROBLOCKD *xd,
#endif // CONFIG_EXT_INTRA || CONFIG_FILTER_INTRA
#if CONFIG_EXT_TX
#if EXT_TX_SIZES == 4
if (xd->lossless[mbmi->segment_id] || txsize_sqr_map[tx_size] > TX_32X32 ||
(txsize_sqr_map[tx_size] >= TX_32X32 && !is_inter_block(mbmi)))
#else
if (xd->lossless[mbmi->segment_id] || txsize_sqr_map[tx_size] >= TX_32X32)
#endif
return DCT_DCT;
if (mbmi->sb_type >= BLOCK_8X8 || CONFIG_CB4X4) {
if (plane_type == PLANE_TYPE_Y) {
......
av1/common/entropymode.c
View file @ aa434238
......@@ -1417,9 +1417,7 @@ static const aom_prob
{ 0 },
{ 0 },
{ 0 },
#if EXT_TX_SIZES == 4
{ 0 },
#endif
},
{
{ 10, 24, 30, 128, 128, 128, 128, 112, 160, 128, 128, 128, 128, 128,
......@@ -1428,26 +1426,17 @@ static const aom_prob
128 },
{ 10, 24, 30, 128, 128, 128, 128, 112, 160, 128, 128, 128, 128, 128,
128 },
#if EXT_TX_SIZES == 4
{ 10, 24, 30, 128, 128, 128, 128, 112, 160, 128, 128, 128, 128, 128,
128 },
#endif
},
{
{ 10, 30, 128, 112, 160, 128, 128, 128, 128, 128, 128 },
{ 10, 30, 128, 112, 160, 128, 128, 128, 128, 128, 128 },
{ 10, 30, 128, 112, 160, 128, 128, 128, 128, 128, 128 },
#if EXT_TX_SIZES == 4
{ 10, 30, 128, 112, 160, 128, 128, 128, 128, 128, 128 },
#endif
},
{
{ 12 },
{ 12 },
{ 12 },
#if EXT_TX_SIZES == 4
{ 12 },
#endif
{ 12 }, { 12 }, { 12 }, { 12 },
}
};
......@@ -1492,7 +1481,6 @@ static const aom_prob
{ 0 },
{ 0 },
},
#if EXT_TX_SIZES == 4
{
{ 0 },
{ 0 },
......@@ -1505,7 +1493,6 @@ static const aom_prob
{ 0 },
{ 0 },
},
#endif
},
{
{
......@@ -1544,7 +1531,6 @@ static const aom_prob
{ 10, 23, 32, 128, 80, 176 },
{ 10, 32, 32, 128, 16, 64 },
},
#if EXT_TX_SIZES == 4
{
{ 8, 224, 32, 128, 64, 128 },
{ 10, 32, 32, 128, 16, 192 },
......@@ -1557,7 +1543,6 @@ static const aom_prob
{ 10, 23, 32, 128, 80, 176 },
{ 10, 32, 32, 128, 16, 64 },
},
#endif
},
{
{
......@@ -1596,7 +1581,6 @@ static const aom_prob
{ 10, 23, 80, 176 },
{ 10, 32, 16, 64 },
},
#if EXT_TX_SIZES == 4
{
{ 8, 224, 64, 128 },
{ 10, 32, 16, 192 },
......@@ -1609,7 +1593,6 @@ static const aom_prob
{ 10, 23, 80, 176 },
{ 10, 32, 16, 64 },
},
#endif
},
};
#else
......
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