diff --git a/vp9/common/vp9_default_coef_probs.h b/vp9/common/vp9_default_coef_probs.h index 15f9e97dd..1954093f5 100644 --- a/vp9/common/vp9_default_coef_probs.h +++ b/vp9/common/vp9_default_coef_probs.h @@ -701,169 +701,169 @@ static const vp9_coeff_probs_model default_coef_probs_4x4[BLOCK_TYPES] = { { /* block Type 0 */ { /* Intra */ { /* Coeff Band 0 */ - { 208, 32, 178,}, - { 102, 43, 132,}, - { 15, 36, 68,} + { 195, 29, 183 }, + { 84, 49, 136 }, + { 8, 42, 71 } }, { /* Coeff Band 1 */ - { 71, 91, 178,}, - { 72, 88, 174,}, - { 40, 79, 154,}, - { 21, 68, 126,}, - { 7, 49, 84,}, - { 1, 20, 32,} + { 31, 107, 169 }, + { 35, 99, 159 }, + { 17, 82, 140 }, + { 8, 66, 114 }, + { 2, 44, 76 }, + { 1, 19, 32 } }, { /* Coeff Band 2 */ - { 108, 110, 206,}, - { 72, 98, 191,}, - { 26, 77, 152,}, - { 7, 57, 106,}, - { 1, 35, 60,}, - { 1, 14, 22,} + { 40, 132, 201 }, + { 29, 114, 187 }, + { 13, 91, 157 }, + { 7, 75, 127 }, + { 3, 58, 95 }, + { 1, 28, 47 } }, { /* Coeff Band 3 */ - { 105, 139, 222,}, - { 76, 118, 205,}, - { 21, 88, 164,}, - { 5, 63, 118,}, - { 1, 42, 74,}, - { 1, 18, 30,} + { 69, 142, 221 }, + { 42, 122, 201 }, + { 15, 91, 159 }, + { 6, 67, 121 }, + { 1, 42, 77 }, + { 1, 17, 31 } }, { /* Coeff Band 4 */ - { 143, 117, 233,}, - { 99, 104, 214,}, - { 26, 81, 170,}, - { 6, 60, 116,}, - { 1, 38, 65,}, - { 1, 15, 26,} + { 102, 148, 228 }, + { 67, 117, 204 }, + { 17, 82, 154 }, + { 6, 59, 114 }, + { 2, 39, 75 }, + { 1, 15, 29 } }, { /* Coeff Band 5 */ - { 155, 74, 238,}, - { 152, 64, 223,}, - { 67, 55, 182,}, - { 27, 44, 127,}, - { 9, 27, 69,}, - { 2, 11, 28,} + { 156, 57, 233 }, + { 119, 57, 212 }, + { 58, 48, 163 }, + { 29, 40, 124 }, + { 12, 30, 81 }, + { 3, 12, 31 } } }, { /* Inter */ { /* Coeff Band 0 */ - { 207, 112, 234,}, - { 145, 120, 212,}, - { 77, 114, 177,} + { 191, 107, 226 }, + { 124, 117, 204 }, + { 25, 99, 155 } }, { /* Coeff Band 1 */ - { 93, 174, 243,}, - { 100, 144, 231,}, - { 28, 101, 186,}, - { 9, 73, 132,}, - { 2, 44, 76,}, - { 1, 19, 33,} + { 29, 148, 210 }, + { 37, 126, 194 }, + { 8, 93, 157 }, + { 2, 68, 118 }, + { 1, 39, 69 }, + { 1, 17, 33 } }, { /* Coeff Band 2 */ - { 116, 175, 246,}, - { 78, 142, 231,}, - { 14, 93, 177,}, - { 4, 65, 122,}, - { 1, 38, 69,}, - { 1, 18, 30,} + { 41, 151, 213 }, + { 27, 123, 193 }, + { 3, 82, 144 }, + { 1, 58, 105 }, + { 1, 32, 60 }, + { 1, 13, 26 } }, { /* Coeff Band 3 */ - { 138, 183, 249,}, - { 93, 147, 237,}, - { 21, 104, 187,}, - { 6, 73, 131,}, - { 1, 47, 83,}, - { 1, 26, 44,} + { 59, 159, 220 }, + { 23, 126, 198 }, + { 4, 88, 151 }, + { 1, 66, 114 }, + { 1, 38, 71 }, + { 1, 18, 34 } }, { /* Coeff Band 4 */ - { 188, 143, 252,}, - { 137, 124, 241,}, - { 32, 89, 188,}, - { 7, 61, 122,}, - { 1, 34, 66,}, - { 1, 18, 34,} + { 114, 136, 232 }, + { 51, 114, 207 }, + { 11, 83, 155 }, + { 3, 56, 105 }, + { 1, 33, 65 }, + { 1, 17, 34 } }, { /* Coeff Band 5 */ - { 198, 92, 253,}, - { 189, 79, 244,}, - { 78, 61, 200,}, - { 34, 50, 146,}, - { 11, 38, 93,}, - { 1, 31, 55,} + { 149, 65, 234 }, + { 121, 57, 215 }, + { 61, 49, 166 }, + { 28, 36, 114 }, + { 12, 25, 76 }, + { 3, 16, 42 } } } }, { /* block Type 1 */ { /* Intra */ { /* Coeff Band 0 */ - { 207, 35, 219,}, - { 126, 46, 182,}, - { 51, 47, 125,} + { 214, 49, 220 }, + { 132, 63, 188 }, + { 42, 65, 137 } }, { /* Coeff Band 1 */ - { 114, 124, 220,}, - { 142, 116, 213,}, - { 81, 101, 190,}, - { 42, 83, 155,}, - { 16, 62, 104,}, - { 6, 40, 60,} + { 85, 137, 221 }, + { 104, 131, 216 }, + { 49, 111, 192 }, + { 21, 87, 155 }, + { 2, 49, 87 }, + { 1, 16, 28 } }, { /* Coeff Band 2 */ - { 139, 149, 228,}, - { 115, 127, 221,}, - { 43, 100, 189,}, - { 13, 77, 141,}, - { 3, 49, 88,}, - { 1, 23, 41,} + { 89, 163, 230 }, + { 90, 137, 220 }, + { 29, 100, 183 }, + { 10, 70, 135 }, + { 2, 42, 81 }, + { 1, 17, 33 } }, { /* Coeff Band 3 */ - { 119, 185, 236,}, - { 89, 140, 224,}, - { 34, 105, 189,}, - { 14, 78, 142,}, - { 5, 49, 90,}, - { 1, 22, 41,} + { 108, 167, 237 }, + { 55, 133, 222 }, + { 15, 97, 179 }, + { 4, 72, 135 }, + { 1, 45, 85 }, + { 1, 19, 38 } }, { /* Coeff Band 4 */ - { 162, 142, 244,}, - { 129, 120, 231,}, - { 44, 90, 189,}, - { 14, 65, 132,}, - { 3, 38, 72,}, - { 1, 17, 39,} + { 124, 146, 240 }, + { 66, 124, 224 }, + { 17, 88, 175 }, + { 4, 58, 122 }, + { 1, 36, 75 }, + { 1, 18, 37 } }, { /* Coeff Band 5 */ - { 167, 96, 247,}, - { 163, 84, 234,}, - { 70, 63, 185,}, - { 30, 44, 132,}, - { 13, 30, 80,}, - { 5, 13, 38,} + { 141, 79, 241 }, + { 126, 70, 227 }, + { 66, 58, 182 }, + { 30, 44, 136 }, + { 12, 34, 96 }, + { 2, 20, 47 } } }, { /* Inter */ { /* Coeff Band 0 */ - { 242, 90, 246,}, - { 186, 102, 228,}, - { 102, 108, 203,} + { 229, 99, 249 }, + { 143, 111, 235 }, + { 46, 109, 192 } }, { /* Coeff Band 1 */ - { 152, 169, 250,}, - { 164, 149, 242,}, - { 63, 108, 204,}, - { 39, 83, 153,}, - { 31, 66, 108,}, - { 27, 65, 71,} + { 82, 158, 236 }, + { 94, 146, 224 }, + { 25, 117, 191 }, + { 9, 87, 149 }, + { 3, 56, 99 }, + { 1, 33, 57 } }, { /* Coeff Band 2 */ - { 161, 174, 250,}, - { 133, 150, 239,}, - { 32, 105, 197,}, - { 10, 78, 147,}, - { 2, 49, 99,}, - { 1, 26, 53,} + { 83, 167, 237 }, + { 68, 145, 222 }, + { 10, 103, 177 }, + { 2, 72, 131 }, + { 1, 41, 79 }, + { 1, 20, 39 } }, { /* Coeff Band 3 */ - { 160, 187, 251,}, - { 131, 155, 241,}, - { 42, 108, 198,}, - { 18, 81, 151,}, - { 9, 60, 112,}, - { 5, 35, 49,} + { 99, 167, 239 }, + { 47, 141, 224 }, + { 10, 104, 178 }, + { 2, 73, 133 }, + { 1, 44, 85 }, + { 1, 22, 47 } }, { /* Coeff Band 4 */ - { 195, 141, 253,}, - { 169, 128, 245,}, - { 62, 91, 204,}, - { 23, 70, 150,}, - { 2, 44, 78,}, - { 1, 1, 128,} + { 127, 145, 243 }, + { 71, 129, 228 }, + { 17, 93, 177 }, + { 3, 61, 124 }, + { 1, 41, 84 }, + { 1, 21, 52 } }, { /* Coeff Band 5 */ - { 195, 104, 253,}, - { 197, 92, 248,}, - { 88, 71, 214,}, - { 39, 56, 160,}, - { 18, 28, 90,}, - { 128, 128, 128,} + { 157, 78, 244 }, + { 140, 72, 231 }, + { 69, 58, 184 }, + { 31, 44, 137 }, + { 14, 38, 105 }, + { 8, 23, 61 } } } } @@ -872,169 +872,169 @@ static const vp9_coeff_probs_model default_coef_probs_8x8[BLOCK_TYPES] = { { /* block Type 0 */ { /* Intra */ { /* Coeff Band 0 */ - { 196, 40, 199,}, - { 83, 38, 128,}, - { 10, 29, 55,} + { 125, 34, 187 }, + { 52, 41, 133 }, + { 6, 31, 56 } }, { /* Coeff Band 1 */ - { 33, 114, 160,}, - { 69, 107, 155,}, - { 30, 91, 138,}, - { 12, 74, 115,}, - { 4, 52, 80,}, - { 1, 27, 40,} + { 37, 109, 153 }, + { 51, 102, 147 }, + { 23, 87, 128 }, + { 8, 67, 101 }, + { 1, 41, 63 }, + { 1, 19, 29 } }, { /* Coeff Band 2 */ - { 38, 159, 190,}, - { 34, 130, 182,}, - { 10, 97, 153,}, - { 3, 71, 115,}, - { 1, 41, 68,}, - { 1, 16, 27,} + { 31, 154, 185 }, + { 17, 127, 175 }, + { 6, 96, 145 }, + { 2, 73, 114 }, + { 1, 51, 82 }, + { 1, 28, 45 } }, { /* Coeff Band 3 */ - { 41, 184, 214,}, - { 24, 142, 199,}, - { 6, 97, 159,}, - { 1, 63, 110,}, - { 1, 32, 58,}, - { 1, 12, 21,} + { 23, 163, 200 }, + { 10, 131, 185 }, + { 2, 93, 148 }, + { 1, 67, 111 }, + { 1, 41, 69 }, + { 1, 14, 24 } }, { /* Coeff Band 4 */ - { 54, 207, 231,}, - { 32, 156, 213,}, - { 7, 98, 164,}, - { 2, 62, 108,}, - { 1, 32, 57,}, - { 1, 13, 22,} + { 29, 176, 217 }, + { 12, 145, 201 }, + { 3, 101, 156 }, + { 1, 69, 111 }, + { 1, 39, 63 }, + { 1, 14, 23 } }, { /* Coeff Band 5 */ - { 89, 208, 239,}, - { 53, 155, 223,}, - { 12, 102, 170,}, - { 3, 67, 111,}, - { 1, 38, 60,}, - { 1, 18, 26,} + { 57, 192, 233 }, + { 25, 154, 215 }, + { 6, 109, 167 }, + { 3, 78, 118 }, + { 1, 48, 69 }, + { 1, 21, 29 } } }, { /* Inter */ { /* Coeff Band 0 */ - { 205, 121, 244,}, - { 140, 120, 211,}, - { 51, 100, 152,} + { 202, 105, 245 }, + { 108, 106, 216 }, + { 18, 90, 144 } }, { /* Coeff Band 1 */ - { 66, 196, 236,}, - { 99, 164, 223,}, - { 29, 122, 187,}, - { 14, 95, 145,}, - { 6, 68, 97,}, - { 3, 43, 50,} + { 33, 172, 219 }, + { 64, 149, 206 }, + { 14, 117, 177 }, + { 5, 90, 141 }, + { 2, 61, 95 }, + { 1, 37, 57 } }, { /* Coeff Band 2 */ - { 66, 202, 238,}, - { 45, 155, 218,}, - { 6, 96, 163,}, - { 2, 64, 110,}, - { 1, 34, 61,}, - { 1, 13, 24,} + { 33, 179, 220 }, + { 11, 140, 198 }, + { 1, 89, 148 }, + { 1, 60, 104 }, + { 1, 33, 57 }, + { 1, 12, 21 } }, { /* Coeff Band 3 */ - { 66, 204, 242,}, - { 38, 158, 222,}, - { 6, 95, 166,}, - { 2, 61, 111,}, - { 1, 31, 59,}, - { 1, 12, 22,} + { 30, 181, 221 }, + { 8, 141, 198 }, + { 1, 87, 145 }, + { 1, 58, 100 }, + { 1, 31, 55 }, + { 1, 12, 20 } }, { /* Coeff Band 4 */ - { 63, 214, 245,}, - { 38, 164, 228,}, - { 5, 101, 174,}, - { 1, 64, 116,}, - { 1, 34, 63,}, - { 1, 14, 26,} + { 32, 186, 224 }, + { 7, 142, 198 }, + { 1, 86, 143 }, + { 1, 58, 100 }, + { 1, 31, 55 }, + { 1, 12, 22 } }, { /* Coeff Band 5 */ - { 91, 214, 246,}, - { 55, 162, 233,}, - { 10, 104, 179,}, - { 2, 67, 119,}, - { 1, 37, 66,}, - { 1, 16, 30,} + { 57, 192, 227 }, + { 20, 143, 204 }, + { 3, 96, 154 }, + { 1, 68, 112 }, + { 1, 42, 69 }, + { 1, 19, 32 } } } }, { /* block Type 1 */ { /* Intra */ { /* Coeff Band 0 */ - { 211, 32, 212,}, - { 121, 47, 171,}, - { 40, 51, 118,} + { 212, 35, 215 }, + { 113, 47, 169 }, + { 29, 48, 105 } }, { /* Coeff Band 1 */ - { 71, 129, 209,}, - { 118, 122, 206,}, - { 53, 104, 184,}, - { 20, 81, 148,}, - { 3, 47, 82,}, - { 1, 18, 28,} + { 74, 129, 203 }, + { 106, 120, 203 }, + { 49, 107, 178 }, + { 19, 84, 144 }, + { 4, 50, 84 }, + { 1, 15, 25 } }, { /* Coeff Band 2 */ - { 86, 162, 220,}, - { 84, 134, 216,}, - { 26, 102, 186,}, - { 7, 75, 135,}, - { 1, 46, 79,}, - { 1, 20, 35,} + { 71, 172, 217 }, + { 44, 141, 209 }, + { 15, 102, 173 }, + { 6, 76, 133 }, + { 2, 51, 89 }, + { 1, 24, 42 } }, { /* Coeff Band 3 */ - { 89, 191, 232,}, - { 67, 148, 223,}, - { 19, 105, 183,}, - { 5, 72, 127,}, - { 1, 44, 76,}, - { 1, 21, 36,} + { 64, 185, 231 }, + { 31, 148, 216 }, + { 8, 103, 175 }, + { 3, 74, 131 }, + { 1, 46, 81 }, + { 1, 18, 30 } }, { /* Coeff Band 4 */ - { 94, 210, 236,}, - { 68, 153, 224,}, - { 14, 103, 178,}, - { 2, 70, 122,}, - { 1, 42, 72,}, - { 1, 19, 34,} + { 65, 196, 235 }, + { 25, 157, 221 }, + { 5, 105, 174 }, + { 1, 67, 120 }, + { 1, 38, 69 }, + { 1, 15, 30 } }, { /* Coeff Band 5 */ - { 87, 200, 238,}, - { 55, 151, 225,}, - { 11, 106, 179,}, - { 2, 72, 124,}, - { 1, 42, 70,}, - { 1, 17, 28,} + { 65, 204, 238 }, + { 30, 156, 224 }, + { 7, 107, 177 }, + { 2, 70, 124 }, + { 1, 42, 73 }, + { 1, 18, 34 } } }, { /* Inter */ { /* Coeff Band 0 */ - { 238, 66, 250,}, - { 178, 84, 226,}, - { 76, 83, 168,} + { 225, 86, 251 }, + { 144, 104, 235 }, + { 42, 99, 181 } }, { /* Coeff Band 1 */ - { 137, 176, 246,}, - { 176, 160, 237,}, - { 68, 128, 205,}, - { 40, 105, 167,}, - { 22, 84, 131,}, - { 11, 60, 91,} + { 85, 175, 239 }, + { 112, 165, 229 }, + { 29, 136, 200 }, + { 12, 103, 162 }, + { 6, 77, 123 }, + { 2, 53, 84 } }, { /* Coeff Band 2 */ - { 124, 192, 247,}, - { 103, 161, 234,}, - { 19, 108, 190,}, - { 6, 74, 131,}, - { 1, 41, 72,}, - { 1, 14, 24,} + { 75, 183, 239 }, + { 30, 155, 221 }, + { 3, 106, 171 }, + { 1, 74, 128 }, + { 1, 44, 76 }, + { 1, 17, 28 } }, { /* Coeff Band 3 */ - { 118, 200, 248,}, - { 91, 166, 235,}, - { 16, 110, 186,}, - { 3, 72, 124,}, - { 1, 39, 66,}, - { 1, 14, 19,} + { 73, 185, 240 }, + { 27, 159, 222 }, + { 2, 107, 172 }, + { 1, 75, 127 }, + { 1, 42, 73 }, + { 1, 17, 29 } }, { /* Coeff Band 4 */ - { 112, 213, 248,}, - { 80, 172, 234,}, - { 11, 112, 182,}, - { 2, 73, 126,}, - { 1, 40, 69,}, - { 1, 16, 24,} + { 62, 190, 238 }, + { 21, 159, 222 }, + { 2, 107, 172 }, + { 1, 72, 122 }, + { 1, 40, 71 }, + { 1, 18, 32 } }, { /* Coeff Band 5 */ - { 100, 209, 245,}, - { 65, 164, 232,}, - { 11, 117, 186,}, - { 2, 83, 136,}, - { 1, 55, 88,}, - { 1, 10, 38,} + { 61, 199, 240 }, + { 27, 161, 226 }, + { 4, 113, 180 }, + { 1, 76, 129 }, + { 1, 46, 80 }, + { 1, 23, 41 } } } } @@ -1043,169 +1043,169 @@ static const vp9_coeff_probs_model default_coef_probs_16x16[BLOCK_TYPES] = { { /* block Type 0 */ { /* Intra */ { /* Coeff Band 0 */ - { 8, 26, 101,}, - { 2, 25, 67,}, - { 1, 15, 28,} + { 7, 27, 153 }, + { 5, 30, 95 }, + { 1, 16, 30 } }, { /* Coeff Band 1 */ - { 22, 73, 118,}, - { 43, 73, 116,}, - { 24, 66, 105,}, - { 9, 54, 85,}, - { 2, 34, 54,}, - { 1, 14, 22,} + { 50, 75, 127 }, + { 57, 75, 124 }, + { 27, 67, 108 }, + { 10, 54, 86 }, + { 1, 33, 52 }, + { 1, 12, 18 } }, { /* Coeff Band 2 */ - { 34, 123, 149,}, - { 34, 106, 147,}, - { 10, 81, 123,}, - { 2, 56, 87,}, - { 1, 35, 56,}, - { 1, 17, 27,} + { 43, 125, 151 }, + { 26, 108, 148 }, + { 7, 83, 122 }, + { 2, 59, 89 }, + { 1, 38, 60 }, + { 1, 17, 27 } }, { /* Coeff Band 3 */ - { 27, 159, 171,}, - { 17, 119, 162,}, - { 3, 81, 128,}, - { 1, 53, 87,}, - { 1, 31, 52,}, - { 1, 14, 24,} + { 23, 144, 163 }, + { 13, 112, 154 }, + { 2, 75, 117 }, + { 1, 50, 81 }, + { 1, 31, 51 }, + { 1, 14, 23 } }, { /* Coeff Band 4 */ - { 24, 189, 200,}, - { 14, 136, 184,}, - { 2, 87, 140,}, - { 1, 54, 90,}, - { 1, 28, 49,}, - { 1, 12, 21,} + { 18, 162, 185 }, + { 6, 123, 171 }, + { 1, 78, 125 }, + { 1, 51, 86 }, + { 1, 31, 54 }, + { 1, 14, 23 } }, { /* Coeff Band 5 */ - { 32, 220, 227,}, - { 12, 155, 200,}, - { 1, 90, 144,}, - { 1, 53, 90,}, - { 1, 28, 50,}, - { 1, 13, 22,} + { 15, 199, 227 }, + { 3, 150, 204 }, + { 1, 91, 146 }, + { 1, 55, 95 }, + { 1, 30, 53 }, + { 1, 11, 20 } } }, { /* Inter */ { /* Coeff Band 0 */ - { 5, 61, 234,}, - { 3, 65, 184,}, - { 1, 56, 104,} + { 19, 55, 240 }, + { 19, 59, 196 }, + { 3, 52, 105 } }, { /* Coeff Band 1 */ - { 46, 183, 210,}, - { 122, 166, 202,}, - { 49, 125, 177,}, - { 22, 99, 142,}, - { 8, 69, 95,}, - { 2, 38, 51,} + { 41, 166, 207 }, + { 104, 153, 199 }, + { 31, 123, 181 }, + { 14, 101, 152 }, + { 5, 72, 106 }, + { 1, 36, 52 } }, { /* Coeff Band 2 */ - { 56, 196, 218,}, - { 38, 141, 195,}, - { 7, 93, 147,}, - { 2, 63, 101,}, - { 1, 39, 61,}, - { 1, 20, 33,} + { 35, 176, 211 }, + { 12, 131, 190 }, + { 2, 88, 144 }, + { 1, 60, 101 }, + { 1, 36, 60 }, + { 1, 16, 28 } }, { /* Coeff Band 3 */ - { 44, 206, 223,}, - { 27, 147, 200,}, - { 4, 93, 147,}, - { 1, 58, 95,}, - { 1, 32, 52,}, - { 1, 14, 23,} + { 28, 183, 213 }, + { 8, 134, 191 }, + { 1, 86, 142 }, + { 1, 56, 96 }, + { 1, 30, 53 }, + { 1, 12, 20 } }, { /* Coeff Band 4 */ - { 39, 216, 227,}, - { 22, 152, 204,}, - { 2, 92, 148,}, - { 1, 55, 91,}, - { 1, 28, 47,}, - { 1, 13, 21,} + { 20, 190, 215 }, + { 4, 135, 192 }, + { 1, 84, 139 }, + { 1, 53, 91 }, + { 1, 28, 49 }, + { 1, 11, 20 } }, { /* Coeff Band 5 */ - { 34, 228, 234,}, - { 13, 161, 208,}, - { 1, 95, 148,}, - { 1, 55, 90,}, - { 1, 30, 51,}, - { 1, 16, 25,} + { 13, 196, 216 }, + { 2, 137, 192 }, + { 1, 86, 143 }, + { 1, 57, 99 }, + { 1, 32, 56 }, + { 1, 13, 24 } } } }, { /* block Type 1 */ { /* Intra */ { /* Coeff Band 0 */ - { 204, 33, 217,}, - { 93, 48, 151,}, - { 18, 43, 86,} + { 211, 29, 217 }, + { 96, 47, 156 }, + { 22, 43, 87 } }, { /* Coeff Band 1 */ - { 43, 121, 184,}, - { 93, 117, 177,}, - { 33, 101, 158,}, - { 11, 81, 129,}, - { 2, 51, 82,}, - { 1, 18, 29,} + { 78, 120, 193 }, + { 111, 116, 186 }, + { 46, 102, 164 }, + { 15, 80, 128 }, + { 2, 49, 76 }, + { 1, 18, 28 } }, { /* Coeff Band 2 */ - { 63, 154, 199,}, - { 53, 128, 191,}, - { 14, 99, 160,}, - { 4, 75, 122,}, - { 1, 47, 77,}, - { 1, 18, 30,} + { 71, 161, 203 }, + { 42, 132, 192 }, + { 10, 98, 150 }, + { 3, 69, 109 }, + { 1, 44, 70 }, + { 1, 18, 29 } }, { /* Coeff Band 3 */ - { 48, 193, 210,}, - { 26, 145, 201,}, - { 6, 104, 165,}, - { 1, 73, 120,}, - { 1, 42, 69,}, - { 1, 16, 27,} + { 57, 186, 211 }, + { 30, 140, 196 }, + { 4, 93, 146 }, + { 1, 62, 102 }, + { 1, 38, 65 }, + { 1, 16, 27 } }, { /* Coeff Band 4 */ - { 47, 213, 225,}, - { 32, 153, 212,}, - { 6, 102, 168,}, - { 1, 66, 111,}, - { 1, 36, 60,}, - { 1, 16, 27,} + { 47, 199, 217 }, + { 14, 145, 196 }, + { 1, 88, 142 }, + { 1, 57, 98 }, + { 1, 36, 62 }, + { 1, 15, 26 } }, { /* Coeff Band 5 */ - { 46, 225, 232,}, - { 24, 162, 214,}, - { 3, 106, 165,}, - { 1, 66, 108,}, - { 1, 35, 59,}, - { 1, 16, 27,} + { 26, 219, 229 }, + { 5, 155, 207 }, + { 1, 94, 151 }, + { 1, 60, 104 }, + { 1, 36, 62 }, + { 1, 16, 28 } } }, { /* Inter */ { /* Coeff Band 0 */ - { 229, 28, 245,}, - { 151, 44, 210,}, - { 55, 48, 131,} + { 233, 29, 248 }, + { 146, 47, 220 }, + { 43, 52, 140 } }, { /* Coeff Band 1 */ - { 126, 165, 239,}, - { 199, 158, 231,}, - { 102, 136, 209,}, - { 64, 116, 181,}, - { 44, 98, 151,}, - { 44, 81, 119,} + { 100, 163, 232 }, + { 179, 161, 222 }, + { 63, 142, 204 }, + { 37, 113, 174 }, + { 26, 89, 137 }, + { 18, 68, 97 } }, { /* Coeff Band 2 */ - { 108, 185, 239,}, - { 91, 155, 224,}, - { 20, 116, 185,}, - { 8, 86, 141,}, - { 3, 50, 92,}, - { 1, 21, 40,} + { 85, 181, 230 }, + { 32, 146, 209 }, + { 7, 100, 164 }, + { 3, 71, 121 }, + { 1, 45, 77 }, + { 1, 18, 30 } }, { /* Coeff Band 3 */ - { 94, 198, 243,}, - { 67, 164, 228,}, - { 14, 120, 185,}, - { 4, 83, 134,}, - { 1, 48, 82,}, - { 1, 26, 38,} + { 65, 187, 230 }, + { 20, 148, 207 }, + { 2, 97, 159 }, + { 1, 68, 116 }, + { 1, 40, 70 }, + { 1, 14, 29 } }, { /* Coeff Band 4 */ - { 82, 210, 245,}, - { 55, 170, 231,}, - { 8, 118, 184,}, - { 2, 78, 126,}, - { 1, 43, 68,}, - { 1, 34, 40,} + { 40, 194, 227 }, + { 8, 147, 204 }, + { 1, 94, 155 }, + { 1, 65, 112 }, + { 1, 39, 66 }, + { 1, 14, 26 } }, { /* Coeff Band 5 */ - { 65, 228, 241,}, - { 33, 173, 226,}, - { 5, 120, 180,}, - { 1, 81, 130,}, - { 1, 51, 78,}, - { 1, 18, 49,} + { 16, 208, 228 }, + { 3, 151, 207 }, + { 1, 98, 160 }, + { 1, 67, 117 }, + { 1, 41, 74 }, + { 1, 17, 31 } } } } @@ -1214,169 +1214,169 @@ static const vp9_coeff_probs_model default_coef_probs_32x32[BLOCK_TYPES] = { { /* block Type 0 */ { /* Intra */ { /* Coeff Band 0 */ - { 37, 34, 137,}, - { 3, 26, 60,}, - { 1, 13, 23,} + { 17, 38, 140 }, + { 7, 34, 80 }, + { 1, 17, 29 } }, { /* Coeff Band 1 */ - { 26, 77, 122,}, - { 43, 76, 123,}, - { 25, 67, 112,}, - { 9, 54, 90,}, - { 2, 32, 52,}, - { 1, 10, 15,} + { 37, 75, 128 }, + { 41, 76, 128 }, + { 26, 66, 116 }, + { 12, 52, 94 }, + { 2, 32, 55 }, + { 1, 10, 16 } }, { /* Coeff Band 2 */ - { 32, 122, 143,}, - { 46, 105, 143,}, - { 17, 79, 116,}, - { 4, 53, 78,}, - { 1, 29, 44,}, - { 1, 12, 18,} + { 50, 127, 154 }, + { 37, 109, 152 }, + { 16, 82, 121 }, + { 5, 59, 85 }, + { 1, 35, 54 }, + { 1, 13, 20 } }, { /* Coeff Band 3 */ - { 33, 157, 160,}, - { 20, 116, 152,}, - { 4, 74, 114,}, - { 1, 44, 69,}, - { 1, 25, 40,}, - { 1, 12, 18,} + { 40, 142, 167 }, + { 17, 110, 157 }, + { 2, 71, 112 }, + { 1, 44, 72 }, + { 1, 27, 45 }, + { 1, 11, 17 } }, { /* Coeff Band 4 */ - { 25, 183, 174,}, - { 13, 124, 159,}, - { 2, 75, 117,}, - { 1, 45, 73,}, - { 1, 26, 43,}, - { 1, 12, 19,} + { 30, 175, 188 }, + { 9, 124, 169 }, + { 1, 74, 116 }, + { 1, 48, 78 }, + { 1, 30, 49 }, + { 1, 11, 18 } }, { /* Coeff Band 5 */ - { 13, 232, 223,}, - { 4, 155, 187,}, - { 1, 86, 131,}, - { 1, 49, 79,}, - { 1, 26, 43,}, - { 1, 12, 20,} + { 10, 222, 223 }, + { 2, 150, 194 }, + { 1, 83, 128 }, + { 1, 48, 79 }, + { 1, 27, 45 }, + { 1, 11, 17 } } }, { /* Inter */ { /* Coeff Band 0 */ - { 51, 37, 227,}, - { 9, 36, 172,}, - { 21, 26, 112,} + { 36, 41, 235 }, + { 29, 36, 193 }, + { 10, 27, 111 } }, { /* Coeff Band 1 */ - { 79, 169, 219,}, - { 177, 166, 216,}, - { 119, 141, 196,}, - { 63, 117, 165,}, - { 30, 87, 117,}, - { 14, 56, 60,} + { 85, 165, 222 }, + { 177, 162, 215 }, + { 110, 135, 195 }, + { 57, 113, 168 }, + { 23, 83, 120 }, + { 10, 49, 61 } }, { /* Coeff Band 2 */ - { 88, 195, 225,}, - { 66, 145, 202,}, - { 12, 97, 152,}, - { 3, 66, 103,}, - { 1, 38, 61,}, - { 1, 19, 30,} + { 85, 190, 223 }, + { 36, 139, 200 }, + { 5, 90, 146 }, + { 1, 60, 103 }, + { 1, 38, 65 }, + { 1, 18, 30 } }, { /* Coeff Band 3 */ - { 79, 211, 228,}, - { 50, 151, 205,}, - { 7, 95, 149,}, - { 1, 62, 98,}, - { 1, 35, 57,}, - { 1, 17, 26,} + { 72, 202, 223 }, + { 23, 141, 199 }, + { 2, 86, 140 }, + { 1, 56, 97 }, + { 1, 36, 61 }, + { 1, 16, 27 } }, { /* Coeff Band 4 */ - { 68, 225, 230,}, - { 39, 156, 206,}, - { 4, 94, 147,}, - { 1, 58, 94,}, - { 1, 32, 52,}, - { 1, 15, 24,} + { 55, 218, 225 }, + { 13, 145, 200 }, + { 1, 86, 141 }, + { 1, 57, 99 }, + { 1, 35, 61 }, + { 1, 13, 22 } }, { /* Coeff Band 5 */ - { 45, 248, 234,}, - { 19, 169, 204,}, - { 2, 98, 145,}, - { 1, 59, 92,}, - { 1, 33, 52,}, - { 1, 15, 24,} + { 15, 235, 212 }, + { 1, 132, 184 }, + { 1, 84, 139 }, + { 1, 57, 97 }, + { 1, 34, 56 }, + { 1, 14, 23 } } } }, { /* block Type 1 */ { /* Intra */ { /* Coeff Band 0 */ - { 179, 23, 200,}, - { 60, 33, 113,}, - { 8, 31, 59,} + { 181, 21, 201 }, + { 61, 37, 123 }, + { 10, 38, 71 } }, { /* Coeff Band 1 */ - { 27, 103, 158,}, - { 90, 101, 159,}, - { 39, 91, 146,}, - { 16, 75, 120,}, - { 3, 48, 76,}, - { 1, 18, 26,} + { 47, 106, 172 }, + { 95, 104, 173 }, + { 42, 93, 159 }, + { 18, 77, 131 }, + { 4, 50, 81 }, + { 1, 17, 23 } }, { /* Coeff Band 2 */ - { 45, 137, 177,}, - { 47, 117, 167,}, - { 16, 90, 136,}, - { 6, 65, 100,}, - { 1, 37, 58,}, - { 1, 13, 19,} + { 62, 147, 199 }, + { 44, 130, 189 }, + { 28, 102, 154 }, + { 18, 75, 115 }, + { 2, 44, 65 }, + { 1, 12, 19 } }, { /* Coeff Band 3 */ - { 36, 171, 194,}, - { 19, 129, 178,}, - { 5, 90, 139,}, - { 1, 59, 93,}, - { 1, 31, 49,}, - { 1, 10, 18,} + { 55, 153, 210 }, + { 24, 130, 194 }, + { 3, 93, 146 }, + { 1, 61, 97 }, + { 1, 31, 50 }, + { 1, 10, 16 } }, { /* Coeff Band 4 */ - { 37, 197, 210,}, - { 20, 142, 191,}, - { 3, 93, 144,}, - { 1, 56, 88,}, - { 1, 29, 47,}, - { 1, 14, 22,} + { 49, 186, 223 }, + { 17, 148, 204 }, + { 1, 96, 142 }, + { 1, 53, 83 }, + { 1, 26, 44 }, + { 1, 11, 17 } }, { /* Coeff Band 5 */ - { 19, 227, 223,}, - { 6, 152, 192,}, - { 1, 89, 138,}, - { 1, 52, 84,}, - { 1, 29, 47,}, - { 1, 14, 23,} + { 13, 217, 212 }, + { 2, 136, 180 }, + { 1, 78, 124 }, + { 1, 50, 83 }, + { 1, 29, 49 }, + { 1, 14, 23 } } }, { /* Inter */ { /* Coeff Band 0 */ - { 205, 14, 245,}, - { 97, 19, 213,}, - { 31, 20, 144,} + { 197, 13, 247 }, + { 82, 17, 222 }, + { 25, 17, 162 } }, { /* Coeff Band 1 */ - { 137, 182, 245,}, - { 231, 185, 242,}, - { 170, 175, 229,}, - { 107, 157, 213,}, - { 77, 126, 183,}, - { 69, 96, 149,} + { 126, 186, 247 }, + { 234, 191, 243 }, + { 176, 177, 234 }, + { 104, 158, 220 }, + { 66, 128, 186 }, + { 55, 90, 137 } }, { /* Coeff Band 2 */ - { 107, 196, 241,}, - { 92, 162, 221,}, - { 20, 108, 181,}, - { 7, 80, 132,}, - { 2, 43, 75,}, - { 1, 15, 48,} + { 111, 197, 242 }, + { 46, 158, 219 }, + { 9, 104, 171 }, + { 2, 65, 125 }, + { 1, 44, 80 }, + { 1, 17, 91 } }, { /* Coeff Band 3 */ - { 107, 202, 244,}, - { 77, 167, 224,}, - { 14, 117, 179,}, - { 3, 84, 134,}, - { 1, 57, 84,}, - { 1, 1, 1,} + { 104, 208, 245 }, + { 39, 168, 224 }, + { 3, 109, 162 }, + { 1, 79, 124 }, + { 1, 50, 102 }, + { 1, 43, 102 } }, { /* Coeff Band 4 */ - { 88, 219, 248,}, - { 61, 178, 234,}, - { 6, 127, 188,}, - { 1, 83, 130,}, - { 1, 61, 66,}, - { 128, 128, 128,} + { 84, 220, 246 }, + { 31, 177, 231 }, + { 2, 115, 180 }, + { 1, 79, 134 }, + { 1, 55, 77 }, + { 1, 60, 79 } }, { /* Coeff Band 5 */ - { 73, 243, 250,}, - { 42, 197, 242,}, - { 10, 137, 197,}, - { 2, 85, 134,}, - { 1, 70, 69,}, - { 1, 1, 1,} + { 43, 243, 240 }, + { 8, 180, 217 }, + { 1, 115, 166 }, + { 1, 84, 121 }, + { 1, 51, 67 }, + { 1, 16, 6 } } } } diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index bf57e7ecc..a40962003 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -17,84 +17,84 @@ static const vp9_prob default_kf_uv_probs[VP9_INTRA_MODES] [VP9_INTRA_MODES - 1] = { - { 149, 13, 48, 141, 174, 131, 54, 61, 109 } /* y = dc */, - { 120, 17, 119, 132, 103, 103, 54, 100, 130 } /* y = v */, - { 114, 16, 19, 177, 220, 145, 31, 33, 122 } /* y = h */, - { 119, 12, 43, 102, 133, 133, 77, 90, 102 } /* y = d45 */, - { 110, 10, 28, 144, 78, 158, 40, 49, 161 } /* y = d135 */, - { 114, 10, 46, 169, 50, 96, 48, 70, 150 } /* y = d117 */, - { 116, 10, 24, 125, 134, 168, 26, 27, 193 } /* y = d153 */, - { 121, 14, 26, 124, 175, 143, 36, 37, 79 } /* y = d27 */, - { 116, 13, 54, 100, 105, 122, 58, 126, 122 } /* y = d63 */, - { 98, 22, 60, 147, 159, 124, 45, 68, 128 } /* y = tm */ + { 144, 11, 54, 157, 195, 130, 46, 58, 108 } /* y = dc */, + { 118, 15, 123, 148, 131, 101, 44, 93, 131 } /* y = v */, + { 113, 12, 23, 188, 226, 142, 26, 32, 125 } /* y = h */, + { 120, 11, 50, 123, 163, 135, 64, 77, 103 } /* y = d45 */, + { 113, 9, 36, 155, 111, 157, 32, 44, 161 } /* y = d135 */, + { 116, 9, 55, 176, 76, 96, 37, 61, 149 } /* y = d117 */, + { 115, 9, 28, 141, 161, 167, 21, 25, 193 } /* y = d153 */, + { 120, 12, 32, 145, 195, 142, 32, 38, 86 } /* y = d27 */, + { 116, 12, 64, 120, 140, 125, 49, 115, 121 } /* y = d63 */, + { 102, 19, 66, 162, 182, 122, 35, 59, 128 } /* y = tm */ }; static const vp9_prob default_if_y_probs[BLOCK_SIZE_GROUPS] [VP9_INTRA_MODES - 1] = { - { 42, 31, 23, 150, 161, 193, 32, 53, 100 } /* block_size < 8x8 */, - { 132, 58, 30, 160, 209, 195, 52, 47, 76 } /* block_size < 16x16 */, - { 179, 85, 24, 168, 236, 198, 87, 45, 46 } /* block_size < 32x32 */, - { 221, 176, 63, 133, 233, 121, 125, 105, 34 } /* block_size >= 32x32 */ + { 65, 32, 18, 144, 162, 194, 41, 51, 98 } /* block_size < 8x8 */, + { 132, 68, 18, 165, 217, 196, 45, 40, 78 } /* block_size < 16x16 */, + { 173, 80, 19, 176, 240, 193, 64, 35, 46 } /* block_size < 32x32 */, + { 221, 135, 38, 194, 248, 121, 96, 85, 29 } /* block_size >= 32x32 */ }; static const vp9_prob default_if_uv_probs[VP9_INTRA_MODES] [VP9_INTRA_MODES - 1] = { - { 115, 7, 78, 180, 210, 127, 34, 57, 104 } /* y = dc */, - { 43, 9, 165, 140, 112, 93, 45, 125, 117 } /* y = v */, - { 68, 6, 25, 206, 241, 154, 16, 23, 102 } /* y = h */, - { 90, 5, 48, 117, 155, 134, 61, 88, 96 } /* y = d45 */, - { 77, 5, 43, 148, 100, 147, 37, 60, 146 } /* y = d135 */, - { 75, 5, 57, 167, 62, 91, 45, 76, 139 } /* y = d117 */, - { 86, 4, 34, 155, 185, 163, 22, 29, 160 } /* y = d153 */, - { 82, 5, 34, 155, 207, 144, 26, 38, 79 } /* y = d27 */, - { 69, 6, 65, 105, 104, 122, 48, 131, 116 } /* y = d63 */, - { 86, 16, 114, 177, 189, 108, 28, 72, 120 } /* y = tm */ + { 120, 7, 76, 176, 208, 126, 28, 54, 103 } /* y = dc */, + { 48, 12, 154, 155, 139, 90, 34, 117, 119 } /* y = v */, + { 67, 6, 25, 204, 243, 158, 13, 21, 96 } /* y = h */, + { 97, 5, 44, 131, 176, 139, 48, 68, 97 } /* y = d45 */, + { 83, 5, 42, 156, 111, 152, 26, 49, 152 } /* y = d135 */, + { 80, 5, 58, 178, 74, 83, 33, 62, 145 } /* y = d117 */, + { 86, 5, 32, 154, 192, 168, 14, 22, 163 } /* y = d153 */, + { 85, 5, 32, 156, 216, 148, 19, 29, 73 } /* y = d27 */, + { 77, 7, 64, 116, 132, 122, 37, 126, 120 } /* y = d63 */, + { 101, 21, 107, 181, 192, 103, 19, 67, 125 } /* y = tm */ }; const vp9_prob vp9_partition_probs[NUM_FRAME_TYPES][NUM_PARTITION_CONTEXTS] [PARTITION_TYPES - 1] = { { /* frame_type = keyframe */ /* 8x8 -> 4x4 */ - { 164, 121, 109 } /* a/l both not split */, - { 69, 11, 129 } /* a split, l not split */, - { 52, 181, 37 } /* l split, a not split */, - { 66, 71, 93 } /* a/l both split */, + { 158, 97, 94 } /* a/l both not split */, + { 93, 24, 99 } /* a split, l not split */, + { 85, 119, 44 } /* l split, a not split */, + { 62, 59, 67 } /* a/l both split */, /* 16x16 -> 8x8 */ - { 154, 48, 43 } /* a/l both not split */, - { 81, 11, 63 } /* a split, l not split */, - { 67, 65, 17 } /* l split, a not split */, - { 57, 18, 24 } /* a/l both split */, + { 149, 53, 53 } /* a/l both not split */, + { 94, 20, 48 } /* a split, l not split */, + { 83, 53, 24 } /* l split, a not split */, + { 52, 18, 18 } /* a/l both split */, /* 32x32 -> 16x16 */ - { 156, 42, 35 } /* a/l both not split */, - { 74, 10, 40 } /* a split, l not split */, - { 59, 53, 10 } /* l split, a not split */, - { 28, 10, 9 } /* a/l both split */, + { 150, 40, 39 } /* a/l both not split */, + { 78, 12, 26 } /* a split, l not split */, + { 67, 33, 11 } /* l split, a not split */, + { 24, 7, 5 } /* a/l both split */, /* 64x64 -> 32x32 */ - { 168, 32, 43 } /* a/l both not split */, - { 59, 13, 41 } /* a split, l not split */, - { 60, 25, 10 } /* l split, a not split */, - { 13, 5, 4 } /* a/l both split */ + { 174, 35, 49 } /* a/l both not split */, + { 68, 11, 27 } /* a split, l not split */, + { 57, 15, 9 } /* l split, a not split */, + { 12, 3, 3 } /* a/l both split */ }, { /* frame_type = interframe */ /* 8x8 -> 4x4 */ - { 192, 121, 151 } /* a/l both not split */, - { 134, 63, 162 } /* a split, l not split */, - { 136, 134, 127 } /* l split, a not split */, - { 101, 97, 131 } /* a/l both split */, + { 199, 122, 141 } /* a/l both not split */, + { 147, 63, 159 } /* a split, l not split */, + { 148, 133, 118 } /* l split, a not split */, + { 121, 104, 114 } /* a/l both split */, /* 16x16 -> 8x8 */ - { 167, 67, 80 } /* a/l both not split */, - { 87, 36, 70 } /* a split, l not split */, - { 90, 61, 45 } /* l split, a not split */, - { 46, 31, 32 } /* a/l both split */, + { 174, 73, 87 } /* a/l both not split */, + { 92, 41, 83 } /* a split, l not split */, + { 82, 99, 50 } /* l split, a not split */, + { 53, 39, 39 } /* a/l both split */, /* 32x32 -> 16x16 */ - { 167, 63, 75 } /* a/l both not split */, - { 67, 27, 61 } /* a split, l not split */, - { 56, 87, 31 } /* l split, a not split */, - { 15, 13, 11 } /* a/l both split */, + { 177, 58, 59 } /* a/l both not split */, + { 68, 26, 63 } /* a split, l not split */, + { 52, 79, 25 } /* l split, a not split */, + { 17, 14, 12 } /* a/l both split */, /* 64x64 -> 32x32 */ - { 222, 45, 44 } /* a/l both not split */, - { 62, 17, 62 } /* a split, l not split */, - { 52, 65, 16 } /* l split, a not split */, - { 9, 7, 6 } /* a/l both split */ + { 222, 34, 30 } /* a/l both not split */, + { 72, 16, 44 } /* a split, l not split */, + { 58, 32, 12 } /* l split, a not split */, + { 10, 7, 6 } /* a/l both split */ } }; @@ -130,7 +130,7 @@ struct vp9_token vp9_sb_mv_ref_encoding_array[VP9_INTER_MODES]; struct vp9_token vp9_partition_encodings[PARTITION_TYPES]; static const vp9_prob default_intra_inter_p[INTRA_INTER_CONTEXTS] = { - 6, 87, 165, 213 + 9, 102, 187, 225 }; static const vp9_prob default_comp_inter_p[COMP_INTER_CONTEXTS] = { @@ -138,15 +138,15 @@ static const vp9_prob default_comp_inter_p[COMP_INTER_CONTEXTS] = { }; static const vp9_prob default_comp_ref_p[REF_CONTEXTS] = { - 36, 93, 136, 205, 236 + 50, 126, 123, 221, 226 }; static const vp9_prob default_single_ref_p[REF_CONTEXTS][2] = { - { 30, 17 }, - { 80, 66 }, - { 142, 129 }, - { 192, 178 }, - { 235, 248 }, + { 33, 16 }, + { 77, 74 }, + { 142, 142 }, + { 172, 170 }, + { 238, 247 } }; void tx_counts_to_branch_counts(unsigned int *tx_count_32x32p, diff --git a/vp9/common/vp9_modecontext.c b/vp9/common/vp9_modecontext.c index f50652a62..a79ab2a6c 100644 --- a/vp9/common/vp9_modecontext.c +++ b/vp9/common/vp9_modecontext.c @@ -15,114 +15,114 @@ const vp9_prob vp9_kf_default_bmode_probs[VP9_INTRA_MODES] [VP9_INTRA_MODES] [VP9_INTRA_MODES - 1] = { { /* above = dc */ - { 165, 25, 57, 147, 137, 207, 70, 49, 89 } /* left = dc */, - { 107, 33, 127, 132, 131, 173, 86, 88, 105 } /* left = v */, - { 87, 25, 24, 193, 225, 213, 44, 33, 94 } /* left = h */, - { 82, 32, 42, 91, 116, 154, 134, 119, 110 } /* left = d45 */, - { 87, 41, 47, 164, 49, 219, 85, 72, 84 } /* left = d135 */, - { 83, 29, 29, 134, 55, 84, 58, 132, 185 } /* left = d117 */, - { 78, 22, 24, 134, 145, 161, 37, 32, 199 } /* left = d153 */, - { 103, 25, 33, 121, 156, 215, 34, 32, 29 } /* left = d27 */, - { 73, 28, 26, 91, 75, 116, 67, 169, 128 } /* left = d63 */, - { 62, 79, 46, 119, 142, 197, 97, 73, 133 } /* left = tm */ + { 137, 30, 42, 148, 151, 207, 70, 52, 91 } /* left = dc */, + { 92, 45, 102, 136, 116, 180, 74, 90, 100 } /* left = v */, + { 73, 32, 19, 187, 222, 215, 46, 34, 100 } /* left = h */, + { 91, 30, 32, 116, 121, 186, 93, 86, 94 } /* left = d45 */, + { 72, 35, 36, 149, 68, 206, 68, 63, 105 } /* left = d135 */, + { 73, 31, 28, 138, 57, 124, 55, 122, 151 } /* left = d117 */, + { 67, 23, 21, 140, 126, 197, 40, 37, 171 } /* left = d153 */, + { 86, 27, 28, 128, 154, 212, 45, 43, 53 } /* left = d27 */, + { 74, 32, 27, 107, 86, 160, 63, 134, 102 } /* left = d63 */, + { 59, 67, 44, 140, 161, 202, 78, 67, 119 } /* left = tm */ }, { /* above = v */ - { 77, 19, 144, 147, 131, 159, 67, 75, 108 } /* left = dc */, - { 48, 30, 180, 135, 139, 124, 84, 125, 102 } /* left = v */, - { 47, 14, 76, 169, 216, 171, 48, 35, 77 } /* left = h */, - { 53, 39, 82, 93, 98, 165, 128, 156, 115 } /* left = d45 */, - { 59, 52, 88, 155, 54, 208, 95, 109, 23 } /* left = d135 */, - { 45, 30, 76, 136, 51, 95, 62, 154, 157 } /* left = d117 */, - { 45, 22, 60, 127, 136, 156, 45, 67, 157 } /* left = d153 */, - { 59, 30, 78, 107, 157, 181, 49, 39, 50 } /* left = d27 */, - { 45, 33, 70, 85, 76, 127, 76, 185, 89 } /* left = d63 */, - { 41, 69, 104, 113, 125, 154, 110, 123, 88 } /* left = tm */ + { 63, 36, 126, 146, 123, 158, 60, 90, 96 } /* left = dc */, + { 43, 46, 168, 134, 107, 128, 69, 142, 92 } /* left = v */, + { 44, 29, 68, 159, 201, 177, 50, 57, 77 } /* left = h */, + { 58, 38, 76, 114, 97, 172, 78, 133, 92 } /* left = d45 */, + { 46, 41, 76, 140, 63, 184, 69, 112, 57 } /* left = d135 */, + { 38, 32, 85, 140, 46, 112, 54, 151, 133 } /* left = d117 */, + { 39, 27, 61, 131, 110, 175, 44, 75, 136 } /* left = d153 */, + { 52, 30, 74, 113, 130, 175, 51, 64, 58 } /* left = d27 */, + { 47, 35, 80, 100, 74, 143, 64, 163, 74 } /* left = d63 */, + { 36, 61, 116, 114, 128, 162, 80, 125, 82 } /* left = tm */ }, { /* above = h */ - { 85, 12, 38, 172, 219, 185, 40, 29, 118 } /* left = dc */, - { 52, 25, 78, 175, 211, 189, 56, 37, 108 } /* left = v */, - { 38, 11, 17, 207, 245, 224, 18, 13, 84 } /* left = h */, - { 63, 42, 25, 121, 162, 179, 63, 53, 90 } /* left = d45 */, - { 69, 59, 35, 146, 108, 245, 33, 56, 115 } /* left = d135 */, - { 45, 27, 30, 160, 118, 128, 75, 49, 147 } /* left = d117 */, - { 40, 17, 19, 147, 198, 169, 30, 14, 181 } /* left = d153 */, - { 56, 19, 15, 150, 207, 212, 17, 22, 28 } /* left = d27 */, - { 45, 50, 21, 97, 113, 135, 68, 89, 72 } /* left = d63 */, - { 41, 70, 19, 165, 199, 203, 54, 52, 121 } /* left = tm */ + { 82, 26, 26, 171, 208, 204, 44, 32, 105 } /* left = dc */, + { 55, 44, 68, 166, 179, 192, 57, 57, 108 } /* left = v */, + { 42, 26, 11, 199, 241, 228, 23, 15, 85 } /* left = h */, + { 68, 42, 19, 131, 160, 199, 55, 52, 83 } /* left = d45 */, + { 58, 50, 25, 139, 115, 232, 39, 52, 118 } /* left = d135 */, + { 50, 35, 33, 153, 104, 162, 64, 59, 131 } /* left = d117 */, + { 44, 24, 16, 150, 177, 202, 33, 19, 156 } /* left = d153 */, + { 55, 27, 12, 153, 203, 218, 26, 27, 49 } /* left = d27 */, + { 53, 49, 21, 110, 116, 168, 59, 80, 76 } /* left = d63 */, + { 38, 72, 19, 168, 203, 212, 50, 50, 107 } /* left = tm */ }, { /* above = d45 */ - { 124, 25, 52, 122, 127, 200, 116, 88, 105 } /* left = dc */, - { 60, 31, 107, 103, 119, 136, 135, 150, 90 } /* left = v */, - { 70, 28, 37, 157, 203, 192, 73, 67, 21 } /* left = h */, - { 62, 33, 39, 54, 67, 159, 150, 114, 61 } /* left = d45 */, - { 69, 41, 46, 102, 64, 240, 68, 103, 111 } /* left = d135 */, - { 59, 27, 39, 121, 68, 132, 101, 139, 96 } /* left = d117 */, - { 55, 19, 33, 119, 109, 198, 61, 88, 224 } /* left = d153 */, - { 92, 16, 40, 107, 160, 242, 48, 62, 15 } /* left = d27 */, - { 57, 27, 36, 65, 95, 130, 94, 213, 222 } /* left = d63 */, - { 47, 47, 47, 101, 130, 154, 130, 105, 102 } /* left = tm */ + { 103, 26, 36, 129, 132, 201, 83, 80, 93 } /* left = dc */, + { 59, 38, 83, 112, 103, 162, 98, 136, 90 } /* left = v */, + { 62, 30, 23, 158, 200, 207, 59, 57, 50 } /* left = h */, + { 67, 30, 29, 84, 86, 191, 102, 91, 59 } /* left = d45 */, + { 60, 32, 33, 112, 71, 220, 64, 89, 104 } /* left = d135 */, + { 53, 26, 34, 130, 56, 149, 84, 120, 103 } /* left = d117 */, + { 53, 21, 23, 133, 109, 210, 56, 77, 172 } /* left = d153 */, + { 77, 19, 29, 112, 142, 228, 55, 66, 36 } /* left = d27 */, + { 61, 29, 29, 93, 97, 165, 83, 175, 162 } /* left = d63 */, + { 47, 47, 43, 114, 137, 181, 100, 99, 95 } /* left = tm */ }, { /* above = d135 */ - { 80, 19, 42, 132, 81, 205, 51, 36, 99 } /* left = dc */, - { 60, 34, 67, 145, 76, 196, 72, 61, 112 } /* left = v */, - { 46, 25, 29, 172, 181, 208, 37, 11, 79 } /* left = h */, - { 59, 45, 20, 103, 42, 203, 57, 68, 107 } /* left = d45 */, - { 68, 41, 25, 190, 21, 226, 68, 65, 38 } /* left = d135 */, - { 42, 38, 34, 133, 48, 145, 57, 106, 237 } /* left = d117 */, - { 35, 20, 11, 139, 94, 197, 49, 50, 182 } /* left = d153 */, - { 64, 26, 24, 122, 73, 230, 27, 27, 39 } /* left = d27 */, - { 53, 49, 25, 118, 52, 147, 84, 104, 103 } /* left = d63 */, - { 62, 70, 35, 156, 90, 214, 95, 140, 211 } /* left = tm */ + { 69, 23, 29, 128, 83, 199, 46, 44, 101 } /* left = dc */, + { 53, 40, 55, 139, 69, 183, 61, 80, 110 } /* left = v */, + { 40, 29, 19, 161, 180, 207, 43, 24, 91 } /* left = h */, + { 60, 34, 19, 105, 61, 198, 53, 64, 89 } /* left = d45 */, + { 52, 31, 22, 158, 40, 209, 58, 62, 89 } /* left = d135 */, + { 44, 31, 29, 147, 46, 158, 56, 102, 198 } /* left = d117 */, + { 35, 19, 12, 135, 87, 209, 41, 45, 167 } /* left = d153 */, + { 55, 25, 21, 118, 95, 215, 38, 39, 66 } /* left = d27 */, + { 51, 38, 25, 113, 58, 164, 70, 93, 97 } /* left = d63 */, + { 47, 54, 34, 146, 108, 203, 72, 103, 151 } /* left = tm */ }, { /* above = d117 */ - { 78, 14, 37, 152, 67, 100, 44, 103, 160 } /* left = dc */, - { 50, 20, 86, 139, 72, 98, 62, 111, 157 } /* left = v */, - { 42, 17, 33, 169, 153, 139, 62, 61, 136 } /* left = h */, - { 48, 21, 39, 123, 65, 143, 76, 131, 87 } /* left = d45 */, - { 47, 41, 44, 149, 49, 221, 51, 107, 122 } /* left = d135 */, - { 37, 18, 26, 177, 20, 66, 58, 131, 148 } /* left = d117 */, - { 39, 19, 26, 125, 77, 115, 22, 75, 192 } /* left = d153 */, - { 48, 13, 33, 125, 113, 132, 30, 77, 99 } /* left = d27 */, - { 45, 27, 15, 119, 42, 96, 45, 168, 164 } /* left = d63 */, - { 48, 52, 52, 129, 60, 158, 58, 89, 153 } /* left = tm */ + { 64, 19, 37, 156, 66, 138, 49, 95, 133 } /* left = dc */, + { 46, 27, 80, 150, 55, 124, 55, 121, 135 } /* left = v */, + { 36, 23, 27, 165, 149, 166, 54, 64, 118 } /* left = h */, + { 53, 21, 36, 131, 63, 163, 60, 109, 81 } /* left = d45 */, + { 40, 26, 35, 154, 40, 185, 51, 97, 123 } /* left = d135 */, + { 35, 19, 34, 179, 19, 97, 48, 129, 124 } /* left = d117 */, + { 36, 20, 26, 136, 62, 164, 33, 77, 154 } /* left = d153 */, + { 45, 18, 32, 130, 90, 157, 40, 79, 91 } /* left = d27 */, + { 45, 26, 28, 129, 45, 129, 49, 147, 123 } /* left = d63 */, + { 38, 44, 51, 136, 74, 162, 57, 97, 121 } /* left = tm */ }, { /* above = d153 */ - { 82, 9, 31, 121, 146, 145, 23, 28, 194 } /* left = dc */, - { 57, 32, 78, 121, 148, 128, 50, 37, 217 } /* left = v */, - { 38, 12, 19, 158, 221, 172, 12, 22, 166 } /* left = h */, - { 49, 32, 24, 100, 125, 142, 72, 83, 132 } /* left = d45 */, - { 54, 36, 22, 172, 49, 225, 88, 72, 59 } /* left = d135 */, - { 43, 7, 23, 130, 95, 86, 44, 57, 206 } /* left = d117 */, - { 34, 13, 12, 90, 196, 91, 8, 10, 226 } /* left = d153 */, - { 55, 23, 17, 106, 127, 207, 32, 23, 92 } /* left = d27 */, - { 54, 28, 20, 121, 76, 151, 45, 110, 124 } /* left = d63 */, - { 41, 51, 31, 120, 192, 74, 45, 62, 163 } /* left = tm */ + { 75, 17, 22, 136, 138, 185, 32, 34, 166 } /* left = dc */, + { 56, 39, 58, 133, 117, 173, 48, 53, 187 } /* left = v */, + { 35, 21, 12, 161, 212, 207, 20, 23, 145 } /* left = h */, + { 56, 29, 19, 117, 109, 181, 55, 68, 112 } /* left = d45 */, + { 47, 29, 17, 153, 64, 220, 59, 51, 114 } /* left = d135 */, + { 46, 16, 24, 136, 76, 147, 41, 64, 172 } /* left = d117 */, + { 34, 17, 11, 108, 152, 187, 13, 15, 209 } /* left = d153 */, + { 51, 24, 14, 115, 133, 209, 32, 26, 104 } /* left = d27 */, + { 55, 30, 18, 122, 79, 179, 44, 88, 116 } /* left = d63 */, + { 37, 49, 25, 129, 168, 164, 41, 54, 148 } /* left = tm */ }, { /* above = d27 */ - { 88, 10, 40, 120, 157, 211, 25, 27, 54 } /* left = dc */, - { 64, 31, 69, 121, 129, 184, 36, 29, 45 } /* left = v */, - { 51, 11, 22, 170, 232, 209, 11, 20, 64 } /* left = h */, - { 65, 43, 19, 102, 91, 208, 68, 78, 75 } /* left = d45 */, - { 64, 40, 23, 171, 47, 229, 45, 48, 19 } /* left = d135 */, - { 43, 27, 39, 136, 76, 149, 92, 13, 114 } /* left = d117 */, - { 53, 19, 14, 128, 148, 173, 31, 25, 133 } /* left = d153 */, - { 73, 19, 13, 97, 137, 218, 12, 12, 10 } /* left = d27 */, - { 57, 35, 15, 111, 68, 149, 90, 102, 16 } /* left = d63 */, - { 43, 63, 23, 107, 144, 200, 64, 47, 88 } /* left = tm */ + { 82, 22, 32, 127, 143, 213, 39, 41, 70 } /* left = dc */, + { 62, 44, 61, 123, 105, 189, 48, 57, 64 } /* left = v */, + { 47, 25, 17, 175, 222, 220, 24, 30, 86 } /* left = h */, + { 68, 36, 17, 106, 102, 206, 59, 74, 74 } /* left = d45 */, + { 57, 39, 23, 151, 68, 216, 55, 63, 58 } /* left = d135 */, + { 49, 30, 35, 141, 70, 168, 82, 40, 115 } /* left = d117 */, + { 51, 25, 15, 136, 129, 202, 38, 35, 139 } /* left = d153 */, + { 68, 26, 16, 111, 141, 215, 29, 28, 28 } /* left = d27 */, + { 59, 39, 19, 114, 75, 180, 77, 104, 42 } /* left = d63 */, + { 40, 61, 26, 126, 152, 206, 61, 59, 93 } /* left = tm */ }, { /* above = d63 */ - { 95, 19, 44, 97, 120, 145, 81, 142, 115 } /* left = dc */, - { 46, 29, 93, 95, 106, 133, 83, 189, 177 } /* left = v */, - { 54, 19, 29, 136, 181, 157, 80, 67, 47 } /* left = h */, - { 44, 26, 34, 83, 125, 180, 116, 218, 206 } /* left = d45 */, - { 56, 41, 25, 118, 55, 192, 93, 121, 22 } /* left = d135 */, - { 44, 31, 30, 110, 67, 80, 56, 217, 225 } /* left = d117 */, - { 44, 14, 25, 101, 105, 136, 57, 83, 133 } /* left = d153 */, - { 62, 16, 28, 105, 157, 164, 67, 92, 58 } /* left = d27 */, - { 36, 18, 25, 57, 88, 113, 59, 210, 127 } /* left = d63 */, - { 36, 41, 44, 79, 104, 129, 100, 151, 105 } /* left = tm */ + { 78, 23, 39, 111, 117, 170, 74, 124, 94 } /* left = dc */, + { 48, 34, 86, 101, 92, 146, 78, 179, 134 } /* left = v */, + { 47, 22, 24, 138, 187, 178, 68, 69, 59 } /* left = h */, + { 56, 25, 33, 105, 112, 187, 95, 177, 129 } /* left = d45 */, + { 48, 31, 27, 114, 63, 183, 82, 116, 56 } /* left = d135 */, + { 43, 28, 37, 121, 63, 123, 61, 192, 169 } /* left = d117 */, + { 42, 17, 24, 109, 97, 177, 56, 76, 122 } /* left = d153 */, + { 58, 18, 28, 105, 139, 182, 70, 92, 63 } /* left = d27 */, + { 46, 23, 32, 74, 86, 150, 67, 183, 88 } /* left = d63 */, + { 36, 38, 48, 92, 122, 165, 88, 137, 91 } /* left = tm */ }, { /* above = tm */ - { 90, 61, 68, 152, 141, 209, 79, 59, 93 } /* left = dc */, - { 49, 71, 127, 132, 129, 187, 89, 105, 113 } /* left = v */, - { 48, 29, 26, 190, 225, 190, 55, 32, 75 } /* left = h */, - { 58, 51, 46, 110, 134, 192, 124, 100, 113 } /* left = d45 */, - { 69, 60, 38, 156, 82, 214, 79, 89, 24 } /* left = d135 */, - { 48, 54, 50, 139, 71, 106, 77, 162, 18 } /* left = d117 */, - { 52, 34, 33, 137, 149, 184, 45, 67, 169 } /* left = d153 */, - { 67, 29, 32, 123, 176, 244, 47, 27, 31 } /* left = d27 */, - { 38, 43, 46, 93, 106, 140, 78, 143, 111 } /* left = d63 */, - { 55, 98, 50, 135, 140, 208, 95, 103, 95 } /* left = tm */ + { 65, 70, 60, 155, 159, 199, 61, 60, 81 } /* left = dc */, + { 44, 78, 115, 132, 119, 173, 71, 112, 93 } /* left = v */, + { 39, 38, 21, 184, 227, 206, 42, 32, 64 } /* left = h */, + { 58, 47, 36, 124, 137, 193, 80, 82, 78 } /* left = d45 */, + { 49, 50, 35, 144, 95, 205, 63, 78, 59 } /* left = d135 */, + { 41, 53, 52, 148, 71, 142, 65, 128, 51 } /* left = d117 */, + { 40, 36, 28, 143, 143, 202, 40, 55, 137 } /* left = d153 */, + { 52, 34, 29, 129, 183, 227, 42, 35, 43 } /* left = d27 */, + { 42, 44, 44, 104, 105, 164, 64, 130, 80 } /* left = d63 */, + { 43, 81, 53, 140, 169, 204, 68, 84, 72 } /* left = tm */ } };