Commit 153e1f86 authored by Debargha Mukherjee's avatar Debargha Mukherjee
Browse files

Add default 64x64 scan orders and entropy models

Adds 64x64 default scan orders
Adds 64x64 coefficient entropy models (just copy the 32x32 ones)
Entropy context updates for 64x64 transform
Various misc. changes to support 64x64 transforms

Change-Id: I2c0bc4ba540886dd196e87a78b205407ad3e866b
parent acddc036
......@@ -62,25 +62,33 @@ const uint16_t band_count_table[TX_SIZES_ALL][8] = {
#if CONFIG_CB4X4
{ 1, 2, 2, 3, 0, 0, 0 },
#endif
{ 1, 2, 3, 4, 3, 16 - 13, 0 }, { 1, 2, 3, 4, 11, 64 - 21, 0 },
{ 1, 2, 3, 4, 11, 256 - 21, 0 }, { 1, 2, 3, 4, 11, 1024 - 21, 0 },
{ 1, 2, 3, 4, 8, 32 - 18, 0 }, { 1, 2, 3, 4, 8, 32 - 18, 0 },
{ 1, 2, 3, 4, 11, 128 - 21, 0 }, { 1, 2, 3, 4, 11, 128 - 21, 0 },
{ 1, 2, 3, 4, 11, 512 - 21, 0 }, { 1, 2, 3, 4, 11, 512 - 21, 0 },
{ 1, 2, 3, 4, 3, 16 - 13, 0 }, { 1, 2, 3, 4, 11, 64 - 21, 0 },
{ 1, 2, 3, 4, 11, 256 - 21, 0 }, { 1, 2, 3, 4, 11, 1024 - 21, 0 },
#if CONFIG_TX64X64
{ 1, 2, 3, 4, 11, 4096 - 21, 0 },
#endif // CONFIG_TX64X64
{ 1, 2, 3, 4, 8, 32 - 18, 0 }, { 1, 2, 3, 4, 8, 32 - 18, 0 },
{ 1, 2, 3, 4, 11, 128 - 21, 0 }, { 1, 2, 3, 4, 11, 128 - 21, 0 },
{ 1, 2, 3, 4, 11, 512 - 21, 0 }, { 1, 2, 3, 4, 11, 512 - 21, 0 },
};
const uint16_t band_cum_count_table[TX_SIZES_ALL][8] = {
#if CONFIG_CB4X4
{ 0, 1, 3, 6, 10, 13, 16, 0 },
#endif
{ 0, 1, 3, 6, 10, 13, 16, 0 }, { 0, 1, 3, 6, 10, 21, 64, 0 },
{ 0, 1, 3, 6, 10, 21, 256, 0 }, { 0, 1, 3, 6, 10, 21, 1024, 0 },
{ 0, 1, 3, 6, 10, 18, 32, 0 }, { 0, 1, 3, 6, 10, 18, 32, 0 },
{ 0, 1, 3, 6, 10, 21, 128, 0 }, { 0, 1, 3, 6, 10, 21, 128, 0 },
{ 0, 1, 3, 6, 10, 21, 512, 0 }, { 0, 1, 3, 6, 10, 21, 512, 0 },
{ 0, 1, 3, 6, 10, 13, 16, 0 }, { 0, 1, 3, 6, 10, 21, 64, 0 },
{ 0, 1, 3, 6, 10, 21, 256, 0 }, { 0, 1, 3, 6, 10, 21, 1024, 0 },
#if CONFIG_TX64X64
{ 0, 1, 3, 6, 10, 21, 4096, 0 },
#endif // CONFIG_TX64X64
{ 0, 1, 3, 6, 10, 18, 32, 0 }, { 0, 1, 3, 6, 10, 18, 32, 0 },
{ 0, 1, 3, 6, 10, 21, 128, 0 }, { 0, 1, 3, 6, 10, 21, 128, 0 },
{ 0, 1, 3, 6, 10, 21, 512, 0 }, { 0, 1, 3, 6, 10, 21, 512, 0 },
#if CONFIG_TX64X64
#endif // CONFIG_TX64X64
};
const uint8_t av1_coefband_trans_8x8plus[1024] = {
const uint8_t av1_coefband_trans_8x8plus[MAX_TX_SQUARE] = {
0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5,
// beyond MAXBAND_INDEX+1 all values are filled as 5
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
......@@ -122,6 +130,127 @@ const uint8_t av1_coefband_trans_8x8plus[1024] = {
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
#if CONFIG_TX64X64
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5
#endif // CONFIG_TX64X64
};
#if CONFIG_EXT_TX
......@@ -1129,6 +1258,118 @@ default_qctx_coef_probs[QCTX_BINS][TX_SIZES][PLANE_TYPES] = {
},
},
},
#if CONFIG_TX64X64
{ // TX_SIZE 4
{ // Y plane
{ // Intra
{ // band 0
{ 76, 25, 53}, { 9, 18, 32}, { 1, 12, 18},
{128, 128, 128}, {128, 128, 128}, {128, 128, 128},
},
{ // band 1
{ 29, 55, 91}, { 19, 58, 95}, { 15, 57, 89},
{ 12, 49, 77}, { 3, 29, 44}, { 1, 8, 12},
},
{ // band 2
{ 32, 160, 148}, { 33, 143, 146}, { 19, 122, 132},
{ 6, 90, 102}, { 1, 58, 70}, { 1, 17, 24},
},
{ // band 3
{ 16, 181, 181}, { 6, 142, 165}, { 1, 90, 120},
{ 1, 50, 71}, { 1, 25, 38}, { 1, 9, 14},
},
{ // band 4
{ 13, 203, 203}, { 3, 154, 176}, { 1, 80, 108},
{ 1, 41, 61}, { 1, 24, 37}, { 1, 11, 17},
},
{ // band 5
{ 6, 234, 240}, { 1, 178, 204}, { 1, 80, 119},
{ 1, 45, 71}, { 1, 26, 42}, { 1, 12, 19},
},
},
{ // Intra
{ // band 0
{ 78, 20, 135}, { 25, 18, 101}, { 5, 19, 57},
{128, 128, 128}, {128, 128, 128}, {128, 128, 128},
},
{ // band 1
{ 7, 144, 183}, {117, 151, 195}, {109, 151, 187},
{ 39, 130, 168}, { 11, 100, 125}, { 4, 59, 64},
},
{ // band 2
{ 20, 184, 212}, { 12, 148, 191}, { 2, 98, 141},
{ 1, 65, 100}, { 1, 39, 61}, { 1, 14, 22},
},
{ // band 3
{ 15, 194, 222}, { 6, 153, 198}, { 1, 92, 138},
{ 1, 58, 91}, { 1, 32, 52}, { 1, 12, 18},
},
{ // band 4
{ 14, 206, 232}, { 3, 162, 206}, { 1, 89, 134},
{ 1, 52, 83}, { 1, 28, 46}, { 1, 11, 17},
},
{ // band 5
{ 6, 225, 241}, { 1, 175, 210}, { 1, 81, 125},
{ 1, 48, 78}, { 1, 28, 46}, { 1, 13, 21},
},
},
},
{ // UV plane
{ // Inter
{ // band 0
{124, 23, 93}, { 31, 24, 63}, { 6, 24, 46},
{128, 128, 128}, {128, 128, 128}, {128, 128, 128},
},
{ // band 1
{ 23, 86, 126}, { 45, 90, 145}, { 31, 91, 133},
{ 19, 80, 114}, { 7, 53, 72}, { 1, 20, 27},
},
{ // band 2
{ 51, 186, 189}, { 48, 159, 182}, { 33, 128, 156},
{ 15, 92, 124}, { 2, 62, 83}, { 1, 29, 43},
},
{ // band 3
{ 36, 198, 211}, { 15, 156, 187}, { 3, 97, 137},
{ 1, 61, 93}, { 1, 35, 57}, { 1, 15, 23},
},
{ // band 4
{ 34, 219, 223}, { 9, 162, 193}, { 1, 91, 136},
{ 1, 58, 92}, { 1, 35, 54}, { 1, 14, 23},
},
{ // band 5
{ 19, 243, 243}, { 3, 191, 208}, { 1, 91, 137},
{ 1, 56, 90}, { 1, 34, 55}, { 1, 16, 24},
},
},
{ // Inter
{ // band 0
{119, 20, 197}, { 19, 29, 156}, { 3, 30, 107},
{128, 128, 128}, {128, 128, 128}, {128, 128, 128},
},
{ // band 1
{ 24, 192, 226}, {161, 193, 227}, { 97, 185, 222},
{ 31, 158, 204}, { 16, 122, 165}, { 17, 84, 112},
},
{ // band 2
{ 26, 202, 229}, { 11, 165, 210}, { 2, 103, 152},
{ 1, 68, 104}, { 1, 42, 70}, { 1, 16, 36},
},
{ // band 3
{ 24, 209, 237}, { 6, 169, 214}, { 1, 102, 154},
{ 1, 65, 107}, { 1, 45, 68}, { 1, 17, 24},
},
{ // band 4
{ 19, 219, 243}, { 4, 183, 226}, { 1, 115, 172},
{ 1, 73, 119}, { 1, 43, 77}, { 1, 15, 37},
},
{ // band 5
{ 11, 237, 241}, { 2, 190, 216}, { 1, 108, 146},
{ 1, 59, 94}, { 1, 40, 67}, { 1, 30, 53},
},
},
},
},
#endif // CONFIG_TX64X64
},
{ // Q_Index 1
{ // TX_SIZE 0
......@@ -1571,44 +1812,156 @@ default_qctx_coef_probs[QCTX_BINS][TX_SIZES][PLANE_TYPES] = {
},
},
},
},
{ // Q_Index 2
{ // TX_SIZE 0
#if CONFIG_TX64X64
{ // TX_SIZE 4
{ // Y plane
{ // Intra
{ // band 0
{181, 22, 175}, { 96, 37, 147}, { 35, 41, 105},
{ 41, 40, 104}, { 12, 31, 64}, { 2, 16, 28},
{128, 128, 128}, {128, 128, 128}, {128, 128, 128},
},
{ // band 1
{ 80, 95, 197}, {111, 92, 193}, { 59, 87, 175},
{ 29, 79, 150}, { 10, 65, 118}, { 2, 47, 82},
{ 65, 58, 132}, { 50, 61, 130}, { 40, 57, 116},
{ 22, 46, 87}, { 2, 28, 44}, { 1, 11, 17},
},
{ // band 2
{ 90, 141, 216}, { 77, 120, 210}, { 23, 95, 184},
{ 11, 81, 151}, { 6, 75, 130}, { 2, 58, 113},
{ 55, 139, 135}, { 46, 122, 132}, { 21, 89, 110},
{ 6, 60, 78}, { 1, 38, 54}, { 1, 17, 27},
},
{ // band 3
{122, 167, 231}, { 66, 119, 225}, { 26, 87, 189},
{ 7, 76, 151}, { 2, 63, 125}, { 1, 59, 77},
{ 29, 167, 161}, { 10, 120, 141}, { 1, 69, 98},
{ 1, 42, 66}, { 1, 28, 44}, { 1, 15, 24},
},
{ // band 4
{162, 147, 244}, {110, 97, 236}, { 32, 88, 204},
{ 11, 89, 174}, { 5, 78, 151}, {128, 128, 128},
{ 19, 191, 180}, { 4, 125, 154}, { 1, 70, 107},
{ 1, 48, 77}, { 1, 33, 53}, { 1, 17, 28},
},
{ // band 5
{205, 59, 251}, {176, 68, 248}, { 90, 71, 223},
{ 49, 72, 188}, { 17, 74, 203}, {128, 128, 128},
{ 16, 238, 231}, { 2, 163, 198}, { 1, 85, 134},
{ 1, 54, 90}, { 1, 34, 57}, { 1, 17, 29},
},
},
{ // Intra
{ // band 0
{188, 70, 207}, {140, 73, 189}, { 85, 73, 163},
{ 70, 15, 216}, { 40, 18, 164}, { 14, 17, 83},
{128, 128, 128}, {128, 128, 128}, {128, 128, 128},
},
{ // band 1
{ 59, 144, 239}, { 79, 126, 237}, { 31, 102, 202},
{ 10, 81, 153}, { 3, 56, 102}, { 2, 33, 59},
{ 25, 150, 200}, {185, 154, 211}, {123, 137, 199},
{ 67, 119, 177}, { 31, 96, 137}, { 18, 63, 86},
},
{ // band 2
{ 57, 187, 223}, { 35, 148, 207}, { 7, 104, 159},
{ 2, 72, 113}, { 1, 44, 71}, { 1, 20, 34},
},
{ // band 3
{ 44, 203, 233}, { 18, 157, 212}, { 1, 98, 150},
{ 1, 61, 102}, { 1, 38, 62}, { 1, 19, 31},
},
{ // band 4
{ 41, 215, 238}, { 11, 166, 215}, { 1, 94, 146},
{ 1, 60, 101}, { 1, 37, 63}, { 1, 17, 28},
},
{ // band 5
{ 19, 236, 246}, { 3, 188, 223}, { 1, 95, 146},
{ 1, 58, 95}, { 1, 34, 56}, { 1, 17, 27},
},
},
},
{ // UV plane
{ // Inter
{ // band 0
{146, 27, 156}, { 49, 32, 116}, { 10, 39, 77},
{128, 128, 128}, {128, 128, 128}, {128, 128, 128},
},
{ // band 1
{ 47, 101, 172}, { 93, 100, 178}, { 58, 91, 165},
{ 26, 75, 134}, { 4, 49, 82}, { 2, 22, 33},
},
{ // band 2
{ 60, 158, 196}, { 44, 135, 186}, { 25, 106, 157},
{ 8, 81, 124}, { 2, 56, 86}, { 1, 28, 45},
},
{ // band 3
{ 44, 169, 212}, { 15, 138, 196}, { 2, 100, 157},
{ 1, 74, 119}, { 1, 49, 76}, { 1, 20, 34},
},
{ // band 4
{ 38, 199, 231}, { 11, 158, 214}, { 1, 111, 167},
{ 1, 76, 122}, { 1, 44, 76}, { 1, 17, 39},
},
{ // band 5
{ 40, 236, 246}, { 10, 187, 230}, { 1, 115, 175},
{ 1, 74, 122}, { 1, 42, 71}, { 1, 14, 59},
},
},
{ // Inter
{ // band 0
{161, 26, 237}, { 65, 46, 209}, { 21, 46, 161},
{128, 128, 128}, {128, 128, 128}, {128, 128, 128},
},
{ // band 1
{ 87, 229, 245}, {206, 214, 244}, {148, 186, 236},
{ 89, 165, 221}, { 41, 132, 186}, { 37, 93, 141},
},
{ // band 2
{ 93, 231, 246}, { 47, 181, 231}, { 8, 117, 188},
{ 2, 84, 138}, { 1, 43, 87}, { 1, 27, 41},
},
{ // band 3
{ 80, 239, 250}, { 28, 190, 236}, { 1, 119, 183},
{ 1, 84, 135}, { 1, 81, 69}, { 1, 102, 1},
},
{ // band 4
{ 67, 245, 252}, { 22, 206, 242}, { 1, 130, 195},
{ 1, 77, 136}, { 1, 35, 88}, {128, 128, 128},
},
{ // band 5
{ 43, 250, 228}, { 31, 185, 204}, { 6, 101, 183},
{ 1, 92, 151}, { 1, 84, 137}, {128, 128, 128},
},
},
},
},
#endif // CONFIG_TX64X64
},
{ // Q_Index 2
{ // TX_SIZE 0
{ // Y plane
{ // Intra
{ // band 0
{181, 22, 175}, { 96, 37, 147}, { 35, 41, 105},
{128, 128, 128}, {128, 128, 128}, {128, 128, 128},
},
{ // band 1
{ 80, 95, 197}, {111, 92, 193}, { 59, 87, 175},
{ 29, 79, 150}, { 10, 65, 118}, { 2, 47, 82},
},
{ // band 2
{ 90, 141, 216}, { 77, 120, 210}, { 23, 95, 184},
{ 11, 81, 151}, { 6, 75, 130}, { 2, 58, 113},
},
{ // band 3
{122, 167, 231}, { 66, 119, 225}, { 26, 87, 189},
{ 7, 76, 151}, { 2, 63, 125}, { 1, 59, 77},
},
{ // band 4
{162, 147, 244}, {110, 97, 236}, { 32, 88, 204},
{ 11, 89, 174}, { 5, 78, 151}, {128, 128, 128},
},
{ // band 5
{205, 59, 251}, {176, 68, 248}, { 90, 71, 223},
{ 49, 72, 188}, { 17, 74, 203}, {128, 128, 128},
},
},
{ // Intra
{ // band 0
{188, 70, 207}, {140, 73, 189}, { 85, 73, 163},
{128, 128, 128}, {128, 128, 128}, {128, 128, 128},
},
{ // band 1
{ 59, 144, 239}, { 79, 126, 237}, { 31, 102, 202},
{ 10, 81, 153}, { 3, 56, 102}, { 2, 33, 59},
},
{ // band 2
{100, 152, 243}, { 80, 129, 236}, { 14, 94, 194},
......@@ -2013,6 +2366,118 @@ default_qctx_coef_probs[QCTX_BINS][TX_SIZES][PLANE_TYPES] = {
},
},
},
#if CONFIG_TX64X64
{ // TX_SIZE 4
{ // Y plane
{ // Intra
{ // band 0
{ 51, 21, 156}, { 30, 23, 86}, { 4, 18, 37},
{128, 128, 128}, {128, 128, 128}, {128, 128, 128},