Commit 698a6185 authored by Angie Chiang's avatar Angie Chiang

Re train nz_map prob

We got 0.07% gain on lowres

Change-Id: I0aef14d16025d9933ec3d3b71086f3f55c81df66
parent 1330dfd1
......@@ -174,121 +174,88 @@ const aom_prob default_coeff_base
const aom_prob default_nz_map[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS] = {
#if CONFIG_EXT_TX
#if CONFIG_CHROMA_2X2
{
{
34, 103, 61, 106, 62, 160, 112, 54,
173, 121, 157, 92, 157, 129, 94, 65,
{ { 56, 137, 82, 136, 83, 187, 124, 65,
215, 118, 155, 97, 160, 111, 71, 55,
34, 103, 61, 106, 62, 160, 112, 54,
173, 121, 157, 92, 157, 129, 94, 65,
142, 156, 91, 226, 107, 231, 146, 65,
105, 91, 232, 97, 185, 121, 90, 74,
34, 103, 61, 106, 62, 160, 112, 54,
173, 121, 157, 92, 157, 129, 94, 65,
},
{
52, 124, 84, 136, 107, 197, 161, 82,
183, 151, 153, 140, 152, 134, 109, 81,
153, 195, 123, 154, 106, 196, 143, 67,
232, 125, 121, 105, 159, 113, 88, 66 },
{ 50, 124, 89, 135, 116, 189, 150, 81,
202, 126, 130, 107, 149, 110, 85, 67,
52, 124, 84, 136, 107, 197, 161, 82,
183, 151, 153, 140, 152, 134, 109, 81,
139, 174, 112, 200, 94, 206, 146, 71,
163, 164, 212, 99, 177, 143, 125, 85,
52, 124, 84, 136, 107, 197, 161, 82,
183, 151, 153, 140, 152, 134, 109, 81,
},
},
151, 181, 126, 168, 135, 186, 143, 94,
207, 129, 142, 135, 145, 112, 98, 81 } },
#endif
{
{
34, 103, 61, 106, 62, 160, 112, 54,
173, 121, 157, 92, 157, 129, 94, 65,
{ { 56, 137, 82, 136, 83, 187, 124, 65,
215, 118, 155, 97, 160, 111, 71, 55,
34, 103, 61, 106, 62, 160, 112, 54,
173, 121, 157, 92, 157, 129, 94, 65,
142, 156, 91, 226, 107, 231, 146, 65,
105, 91, 232, 97, 185, 121, 90, 74,
34, 103, 61, 106, 62, 160, 112, 54,
173, 121, 157, 92, 157, 129, 94, 65,
},
153, 195, 123, 154, 106, 196, 143, 67,
232, 125, 121, 105, 159, 113, 88, 66 },
{ 50, 124, 89, 135, 116, 189, 150, 81,
202, 126, 130, 107, 149, 110, 85, 67,
{
52, 124, 84, 136, 107, 197, 161, 82,
183, 151, 153, 140, 152, 134, 109, 81,
139, 174, 112, 200, 94, 206, 146, 71,
163, 164, 212, 99, 177, 143, 125, 85,
52, 124, 84, 136, 107, 197, 161, 82,
183, 151, 153, 140, 152, 134, 109, 81,
151, 181, 126, 168, 135, 186, 143, 94,
207, 129, 142, 135, 145, 112, 98, 81 } },
{ { 57, 156, 91, 162, 99, 212, 149, 81,
223, 128, 182, 121, 216, 163, 119, 94,
52, 124, 84, 136, 107, 197, 161, 82,
183, 151, 153, 140, 152, 134, 109, 81,
},
},
{
{
34, 127, 74, 124, 74, 204, 153, 76,
226, 162, 207, 126, 227, 192, 149, 108,
139, 183, 100, 206, 98, 242, 163, 79,
200, 127, 234, 112, 230, 169, 115, 90,
34, 127, 74, 124, 74, 204, 153, 76,
226, 162, 207, 126, 227, 192, 149, 108,
156, 190, 130, 172, 117, 209, 163, 80,
217, 145, 182, 135, 204, 163, 120, 88 },
{ 48, 133, 102, 143, 119, 190, 170, 109,
197, 127, 176, 137, 214, 168, 130, 119,
34, 127, 74, 124, 74, 204, 153, 76,
226, 162, 207, 126, 227, 192, 149, 108,
},
139, 185, 129, 210, 84, 237, 177, 75,
182, 165, 216, 121, 206, 177, 147, 102,
{
43, 136, 115, 158, 130, 212, 187, 112,
231, 180, 202, 164, 236, 204, 168, 139,
159, 192, 153, 182, 139, 203, 160, 125,
193, 161, 176, 142, 173, 145, 131, 114 } },
{ { 33, 148, 81, 149, 84, 219, 152, 76,
229, 127, 205, 120, 234, 170, 123, 88,
43, 136, 115, 158, 130, 212, 187, 112,
231, 180, 202, 164, 236, 204, 168, 139,
134, 197, 101, 213, 91, 244, 169, 85,
220, 141, 234, 123, 242, 183, 130, 94,
43, 136, 115, 158, 130, 212, 187, 112,
231, 180, 202, 164, 236, 204, 168, 139,
},
},
{
{
25, 117, 70, 120, 77, 215, 171, 102,
234, 156, 235, 155, 247, 220, 176, 127,
25, 117, 70, 120, 77, 215, 171, 102,
234, 156, 235, 155, 247, 220, 176, 127,
25, 117, 70, 120, 77, 215, 171, 102,
234, 156, 235, 155, 247, 220, 176, 127,
},
{
24, 88, 49, 100, 62, 202, 148, 62,
237, 178, 233, 168, 244, 198, 162, 127,
141, 184, 121, 173, 98, 213, 156, 85,
204, 156, 197, 119, 212, 174, 127, 92 },
{ 14, 75, 45, 98, 83, 197, 150, 90,
235, 124, 242, 155, 246, 187, 143, 103,
24, 88, 49, 100, 62, 202, 148, 62,
237, 178, 233, 168, 244, 198, 162, 127,
78, 185, 111, 255, 116, 255, 224, 171,
185, 157, 255, 85, 219, 122, 128, 128,
24, 88, 49, 100, 62, 202, 148, 62,
237, 178, 233, 168, 244, 198, 162, 127,
},
},
{
117, 187, 102, 181, 132, 233, 197, 93,
207, 135, 191, 107, 222, 175, 130, 47 } },
{
11, 54, 17, 69, 26, 128, 125, 56,
232, 130, 237, 121, 250, 168, 134, 114,
{ 14, 79, 44, 86, 59, 178, 124, 63,
244, 106, 233, 117, 252, 185, 132, 92,
11, 54, 17, 69, 26, 128, 125, 56,
232, 130, 237, 121, 250, 168, 134, 114,
85, 225, 47, 236, 103, 255, 190, 116,
235, 114, 247, 123, 250, 174, 122, 110,
11, 54, 17, 69, 26, 128, 125, 56,
232, 130, 237, 121, 250, 168, 134, 114,
},
{
21, 52, 32, 95, 64, 171, 152, 70,
247, 159, 252, 177, 252, 221, 192, 143,
109, 197, 78, 177, 76, 242, 148, 68,
236, 123, 231, 103, 247, 171, 122, 91 },
{ 11, 40, 27, 92, 78, 183, 171, 70,
216, 74, 251, 146, 252, 213, 171, 148,
21, 52, 32, 95, 64, 171, 152, 70,
247, 159, 252, 177, 252, 221, 192, 143,
85, 225, 47, 236, 103, 255, 190, 116,
235, 114, 247, 123, 250, 174, 122, 110,
21, 52, 32, 95, 64, 171, 152, 70,
247, 159, 252, 177, 252, 221, 192, 143,
},
109, 197, 78, 177, 76, 242, 148, 68,
236, 123, 231, 103, 247, 171, 122, 91 },
},
#else // CONFIG_EXT_TX
#if CONFIG_CHROMA_2X2
......
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