Skip to content

GitLab

A
aom-rav1e
Commit 3a9a5278 authored by Urvang Joshi's avatar Urvang Joshi
Browse files
Options

Correction for ALT_INTRA + EXT_TX combo. 

Add extra entries to the 'default_intra_ext_tx_prob' table when
ALT_INTRA is on.

Change-Id: I1b3d28fa06852b4b7c68b061c44318ec83be77b6
parent 3424c2de
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 0 deletions
av1/common/entropymode.c
View file @ 3a9a5278
......@@ -1290,6 +1290,8 @@ static const aom_prob
}
};
// TODO(urvang): 3rd context should be tx_type instead of intra mode just like
// the baseline.
static const aom_prob
default_intra_ext_tx_prob[EXT_TX_SETS_INTRA][EXT_TX_SIZES][INTRA_MODES]
[TX_TYPES - 1] = {
......@@ -1311,6 +1313,9 @@ static const aom_prob
{ 0 },
{ 0 },
{ 0 },
#if CONFIG_ALT_INTRA
{ 0 },
#endif // CONFIG_ALT_INTRA
},
{
{ 0 },
......@@ -1323,6 +1328,9 @@ static const aom_prob
{ 0 },
{ 0 },
{ 0 },
#if CONFIG_ALT_INTRA
{ 0 },
#endif // CONFIG_ALT_INTRA
},
{
{ 0 },
......@@ -1335,6 +1343,9 @@ static const aom_prob
{ 0 },
{ 0 },
{ 0 },
#if CONFIG_ALT_INTRA
{ 0 },
#endif // CONFIG_ALT_INTRA
},
{
{ 0 },
......@@ -1347,6 +1358,9 @@ static const aom_prob
{ 0 },
{ 0 },
{ 0 },
#if CONFIG_ALT_INTRA
{ 0 },
#endif // CONFIG_ALT_INTRA
},
},
{
......@@ -1366,6 +1380,9 @@ static const aom_prob
{ 10, 23, 32, 128, 80, 176 },
{ 10, 23, 32, 128, 80, 176 },
{ 10, 32, 32, 128, 16, 64 },
#if CONFIG_ALT_INTRA
{ 10, 32, 32, 128, 16, 64 },
#endif // CONFIG_ALT_INTRA
},
{
{ 8, 224, 32, 128, 64, 128 },
......@@ -1378,6 +1395,9 @@ static const aom_prob
{ 10, 23, 32, 128, 80, 176 },
{ 10, 23, 32, 128, 80, 176 },
{ 10, 32, 32, 128, 16, 64 },
#if CONFIG_ALT_INTRA
{ 10, 32, 32, 128, 16, 64 },
#endif // CONFIG_ALT_INTRA
},
{
{ 8, 224, 32, 128, 64, 128 },
......@@ -1390,6 +1410,9 @@ static const aom_prob
{ 10, 23, 32, 128, 80, 176 },
{ 10, 23, 32, 128, 80, 176 },
{ 10, 32, 32, 128, 16, 64 },
#if CONFIG_ALT_INTRA
{ 10, 32, 32, 128, 16, 64 },
#endif // CONFIG_ALT_INTRA
},
{
{ 8, 224, 32, 128, 64, 128 },
......@@ -1402,6 +1425,9 @@ static const aom_prob
{ 10, 23, 32, 128, 80, 176 },
{ 10, 23, 32, 128, 80, 176 },
{ 10, 32, 32, 128, 16, 64 },
#if CONFIG_ALT_INTRA
{ 10, 32, 32, 128, 16, 64 },
#endif // CONFIG_ALT_INTRA
},
},
{
......@@ -1421,6 +1447,9 @@ static const aom_prob
{ 10, 23, 80, 176 },
{ 10, 23, 80, 176 },
{ 10, 32, 16, 64 },
#if CONFIG_ALT_INTRA
{ 10, 32, 16, 64 },
#endif // CONFIG_ALT_INTRA
},
{
{ 8, 224, 64, 128 },
......@@ -1433,6 +1462,9 @@ static const aom_prob
{ 10, 23, 80, 176 },
{ 10, 23, 80, 176 },
{ 10, 32, 16, 64 },
#if CONFIG_ALT_INTRA
{ 10, 32, 16, 64 },
#endif // CONFIG_ALT_INTRA
},
{
{ 8, 224, 64, 128 },
......@@ -1445,6 +1477,9 @@ static const aom_prob
{ 10, 23, 80, 176 },
{ 10, 23, 80, 176 },
{ 10, 32, 16, 64 },
#if CONFIG_ALT_INTRA
{ 10, 32, 16, 64 },
#endif // CONFIG_ALT_INTRA
},
{
{ 8, 224, 64, 128 },
......@@ -1457,6 +1492,9 @@ static const aom_prob
{ 10, 23, 80, 176 },
{ 10, 23, 80, 176 },
{ 10, 32, 16, 64 },
#if CONFIG_ALT_INTRA
{ 10, 32, 16, 64 },
#endif // CONFIG_ALT_INTRA
},
},
};
......
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