diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c index 7e061d2ab243d60ab4e0c7902e22de45f9c8f9f2..905bb7e54321c59ddf0794e7c000da7257655bab 100644 --- a/av1/common/entropymode.c +++ b/av1/common/entropymode.c @@ -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 }, }, };