Merge NEW_TOKENSET experiment into EC_MULTISYMBOL.
Change-Id: I0ed6d8f2b6a83641f65096cf41fcde94e70d94d4
diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index 0fb9480..f2695da 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -627,7 +627,7 @@
// The full source code of the generating program is available in:
// tools/gen_constrained_tokenset.py
//
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
// Values for tokens TWO_TOKEN through CATEGORY6_TOKEN included
// in the table here : the ONE_TOKEN probability is
// removed and the probabilities rescaled.
@@ -891,268 +891,7 @@
{ 31131, 1448, 152, 31, 2, 1, 1, 1, 1 },
{ 31486, 1150, 107, 20, 1, 1, 1, 1, 1 },
};
-#elif CONFIG_EC_MULTISYMBOL
-// Values for tokens ONE_TOKEN through CATEGORY6_TOKEN included here.
-// ZERO_TOKEN and EOB_TOKEN are coded as flags outside this coder.
-const aom_cdf_prob
- av1_pareto8_token_probs[COEFF_PROB_MODELS][ENTROPY_TOKENS - 2] = {
- { 128, 127, 127, 126, 251, 495, 965, 1832, 3305, 25412 },
- { 256, 254, 252, 249, 492, 959, 1820, 3283, 5365, 19838 },
- { 384, 379, 374, 369, 724, 1392, 2574, 4417, 6568, 15587 },
- { 512, 503, 494, 486, 946, 1795, 3238, 5289, 7184, 12321 },
- { 640, 626, 612, 599, 1159, 2172, 3818, 5946, 7401, 9795 },
- { 768, 748, 728, 709, 1363, 2522, 4324, 6424, 7352, 7830 },
- { 896, 869, 842, 816, 1559, 2847, 4762, 6755, 7131, 6291 },
- { 1024, 988, 954, 921, 1747, 3148, 5139, 6966, 6803, 5078 },
- { 1152, 1107, 1063, 1022, 1926, 3427, 5460, 7080, 6412, 4119 },
- { 1280, 1224, 1171, 1120, 2098, 3685, 5730, 7113, 5991, 3356 },
- { 1408, 1340, 1276, 1216, 2261, 3923, 5955, 7083, 5560, 2746 },
- { 1536, 1455, 1380, 1308, 2418, 4142, 6140, 7001, 5133, 2255 },
- { 1664, 1569, 1481, 1398, 2567, 4342, 6287, 6879, 4721, 1860 },
- { 1792, 1683, 1580, 1485, 2709, 4525, 6401, 6725, 4329, 1539 },
- { 1920, 1794, 1678, 1570, 2845, 4692, 6486, 6546, 3959, 1278 },
- { 2048, 1905, 1773, 1651, 2974, 4844, 6543, 6350, 3615, 1065 },
- { 2176, 2015, 1867, 1731, 3096, 4980, 6576, 6140, 3296, 891 },
- { 2304, 2123, 1958, 1807, 3212, 5104, 6589, 5922, 3002, 747 },
- { 2432, 2231, 2048, 1882, 3322, 5214, 6581, 5698, 2732, 628 },
- { 2560, 2337, 2136, 1953, 3427, 5311, 6557, 5472, 2485, 530 },
- { 2688, 2442, 2222, 2023, 3525, 5397, 6518, 5246, 2259, 448 },
- { 2816, 2547, 2306, 2090, 3618, 5472, 6465, 5021, 2053, 380 },
- { 2944, 2650, 2388, 2154, 3706, 5537, 6401, 4799, 1866, 323 },
- { 3072, 2752, 2468, 2217, 3788, 5591, 6327, 4581, 1696, 276 },
- { 3200, 2853, 2547, 2277, 3866, 5637, 6243, 4369, 1541, 235 },
- { 3328, 2952, 2624, 2335, 3938, 5673, 6152, 4163, 1401, 202 },
- { 3456, 3051, 2699, 2391, 4006, 5702, 6054, 3962, 1274, 173 },
- { 3584, 3149, 2772, 2444, 4070, 5723, 5950, 3769, 1158, 149 },
- { 3712, 3246, 2843, 2496, 4128, 5736, 5842, 3583, 1054, 128 },
- { 3840, 3341, 2913, 2545, 4183, 5743, 5729, 3404, 959, 111 },
- { 3968, 3436, 2981, 2593, 4233, 5743, 5614, 3232, 872, 96 },
- { 4096, 3529, 3048, 2638, 4280, 5737, 5496, 3067, 794, 83 },
- { 4224, 3621, 3113, 2682, 4322, 5726, 5375, 2909, 724, 72 },
- { 4352, 3712, 3176, 2724, 4361, 5709, 5253, 2759, 659, 63 },
- { 4480, 3803, 3237, 2764, 4396, 5687, 5130, 2615, 601, 55 },
- { 4608, 3892, 3297, 2801, 4428, 5661, 5007, 2478, 548, 48 },
- { 4736, 3980, 3355, 2838, 4456, 5631, 4883, 2347, 500, 42 },
- { 4864, 4067, 3412, 2872, 4481, 5596, 4760, 2223, 456, 37 },
- { 4992, 4152, 3467, 2905, 4503, 5558, 4637, 2105, 417, 32 },
- { 5120, 4237, 3521, 2936, 4521, 5516, 4515, 1993, 381, 28 },
- { 5248, 4321, 3573, 2966, 4537, 5471, 4393, 1886, 348, 25 },
- { 5376, 4404, 3623, 2993, 4550, 5424, 4273, 1785, 318, 22 },
- { 5504, 4486, 3672, 3020, 4560, 5373, 4155, 1688, 291, 19 },
- { 5632, 4566, 3720, 3044, 4568, 5321, 4037, 1597, 266, 17 },
- { 5760, 4646, 3766, 3067, 4572, 5265, 3922, 1511, 244, 15 },
- { 5888, 4724, 3811, 3089, 4575, 5208, 3808, 1429, 223, 13 },
- { 6016, 4802, 3854, 3109, 4575, 5148, 3696, 1352, 204, 12 },
- { 6144, 4878, 3895, 3128, 4573, 5088, 3587, 1278, 187, 10 },
- { 6272, 4953, 3936, 3145, 4568, 5025, 3479, 1209, 172, 9 },
- { 6400, 5028, 3975, 3161, 4561, 4961, 3373, 1143, 158, 8 },
- { 6528, 5101, 4012, 3175, 4553, 4896, 3270, 1081, 145, 7 },
- { 6656, 5173, 4048, 3189, 4542, 4830, 3168, 1022, 133, 7 },
- { 6784, 5244, 4083, 3201, 4530, 4763, 3069, 966, 122, 6 },
- { 6912, 5314, 4117, 3212, 4516, 4694, 2973, 913, 112, 5 },
- { 7040, 5383, 4149, 3221, 4500, 4626, 2878, 863, 103, 5 },
- { 7168, 5452, 4180, 3229, 4482, 4556, 2786, 816, 95, 4 },
- { 7296, 5519, 4210, 3236, 4463, 4486, 2696, 771, 87, 4 },
- { 7424, 5585, 4238, 3242, 4442, 4416, 2609, 729, 80, 3 },
- { 7552, 5650, 4265, 3247, 4420, 4345, 2523, 689, 74, 3 },
- { 7680, 5714, 4291, 3251, 4396, 4274, 2440, 651, 68, 3 },
- { 7808, 5777, 4315, 3254, 4371, 4203, 2359, 616, 63, 2 },
- { 7936, 5838, 4339, 3255, 4345, 4132, 2281, 582, 58, 2 },
- { 8064, 5899, 4361, 3256, 4318, 4061, 2204, 550, 53, 2 },
- { 8192, 5959, 4382, 3255, 4289, 3990, 2130, 520, 49, 2 },
- { 8320, 6018, 4402, 3254, 4259, 3919, 2057, 492, 45, 2 },
- { 8448, 6075, 4421, 3252, 4229, 3848, 1987, 465, 42, 1 },
- { 8576, 6133, 4438, 3248, 4197, 3778, 1919, 439, 39, 1 },
- { 8704, 6188, 4455, 3244, 4164, 3708, 1853, 415, 36, 1 },
- { 8832, 6243, 4470, 3239, 4131, 3638, 1789, 392, 33, 1 },
- { 8960, 6297, 4484, 3233, 4096, 3569, 1727, 371, 30, 1 },
- { 9088, 6349, 4497, 3226, 4061, 3500, 1667, 351, 28, 1 },
- { 9216, 6401, 4509, 3219, 4025, 3432, 1608, 331, 26, 1 },
- { 9344, 6452, 4520, 3210, 3989, 3364, 1551, 313, 24, 1 },
- { 9472, 6501, 4530, 3201, 3952, 3297, 1496, 296, 22, 1 },
- { 9600, 6550, 4539, 3191, 3914, 3230, 1443, 280, 20, 1 },
- { 9728, 6597, 4547, 3180, 3875, 3164, 1392, 265, 19, 1 },
- { 9856, 6644, 4554, 3169, 3836, 3098, 1342, 250, 18, 1 },
- { 9984, 6690, 4560, 3157, 3796, 3034, 1293, 237, 16, 1 },
- { 10112, 6734, 4565, 3144, 3756, 2970, 1247, 224, 15, 1 },
- { 10240, 6778, 4568, 3131, 3716, 2907, 1202, 211, 14, 1 },
- { 10368, 6821, 4571, 3117, 3675, 2844, 1158, 200, 13, 1 },
- { 10496, 6862, 4573, 3102, 3634, 2783, 1116, 189, 12, 1 },
- { 10624, 6903, 4574, 3087, 3592, 2722, 1075, 179, 11, 1 },
- { 10752, 6942, 4575, 3071, 3551, 2662, 1035, 169, 10, 1 },
- { 10880, 6981, 4574, 3054, 3508, 2603, 997, 160, 10, 1 },
- { 11008, 7019, 4572, 3038, 3466, 2544, 960, 151, 9, 1 },
- { 11136, 7055, 4570, 3020, 3424, 2487, 924, 143, 8, 1 },
- { 11264, 7091, 4566, 3002, 3381, 2430, 890, 135, 8, 1 },
- { 11392, 7126, 4563, 2984, 3338, 2374, 856, 127, 7, 1 },
- { 11520, 7159, 4557, 2965, 3295, 2319, 824, 121, 7, 1 },
- { 11648, 7193, 4552, 2945, 3252, 2264, 793, 114, 6, 1 },
- { 11776, 7224, 4545, 2925, 3209, 2211, 763, 108, 6, 1 },
- { 11904, 7255, 4538, 2905, 3165, 2159, 734, 102, 5, 1 },
- { 12032, 7285, 4530, 2884, 3122, 2107, 706, 96, 5, 1 },
- { 12160, 7314, 4520, 2863, 3079, 2056, 679, 91, 5, 1 },
- { 12288, 7341, 4511, 2842, 3036, 2006, 653, 86, 4, 1 },
- { 12416, 7368, 4500, 2820, 2993, 1957, 628, 81, 4, 1 },
- { 12544, 7394, 4489, 2797, 2949, 1909, 604, 77, 4, 1 },
- { 12672, 7419, 4477, 2775, 2906, 1861, 581, 73, 3, 1 },
- { 12800, 7443, 4464, 2752, 2863, 1815, 558, 69, 3, 1 },
- { 12928, 7466, 4451, 2729, 2820, 1769, 536, 65, 3, 1 },
- { 13056, 7488, 4437, 2705, 2777, 1724, 516, 61, 3, 1 },
- { 13184, 7509, 4422, 2682, 2734, 1680, 495, 58, 3, 1 },
- { 13312, 7529, 4406, 2658, 2692, 1637, 476, 55, 2, 1 },
- { 13440, 7548, 4390, 2633, 2650, 1595, 457, 52, 2, 1 },
- { 13568, 7567, 4373, 2609, 2607, 1553, 439, 49, 2, 1 },
- { 13696, 7583, 4356, 2584, 2565, 1513, 422, 46, 2, 1 },
- { 13824, 7600, 4337, 2559, 2523, 1473, 405, 44, 2, 1 },
- { 13952, 7615, 4319, 2533, 2482, 1434, 389, 41, 2, 1 },
- { 14080, 7629, 4300, 2508, 2441, 1395, 373, 39, 2, 1 },
- { 14208, 7643, 4280, 2482, 2400, 1358, 358, 37, 1, 1 },
- { 14336, 7655, 4259, 2457, 2359, 1321, 344, 35, 1, 1 },
- { 14464, 7667, 4238, 2431, 2318, 1285, 330, 33, 1, 1 },
- { 14592, 7677, 4217, 2405, 2278, 1250, 316, 31, 1, 1 },
- { 14720, 7687, 4195, 2378, 2238, 1215, 304, 29, 1, 1 },
- { 14848, 7696, 4172, 2352, 2198, 1181, 291, 28, 1, 1 },
- { 14976, 7703, 4149, 2326, 2159, 1148, 279, 26, 1, 1 },
- { 15104, 7710, 4125, 2299, 2119, 1116, 268, 25, 1, 1 },
- { 15232, 7715, 4101, 2272, 2081, 1085, 257, 23, 1, 1 },
- { 15360, 7721, 4076, 2245, 2042, 1054, 246, 22, 1, 1 },
- { 15488, 7724, 4051, 2219, 2004, 1023, 236, 21, 1, 1 },
- { 15616, 7727, 4025, 2192, 1966, 994, 226, 20, 1, 1 },
- { 15744, 7729, 3999, 2164, 1929, 965, 217, 19, 1, 1 },
- { 15872, 7731, 3972, 2137, 1892, 937, 207, 18, 1, 1 },
- { 16000, 7731, 3945, 2110, 1855, 909, 199, 17, 1, 1 },
- { 16128, 7730, 3918, 2083, 1819, 882, 190, 16, 1, 1 },
- { 16256, 7728, 3890, 2056, 1783, 856, 182, 15, 1, 1 },
- { 16384, 7725, 3862, 2029, 1747, 831, 174, 14, 1, 1 },
- { 16512, 7721, 3833, 2002, 1712, 806, 167, 13, 1, 1 },
- { 16640, 7717, 3804, 1975, 1677, 781, 160, 12, 1, 1 },
- { 16768, 7712, 3775, 1947, 1642, 757, 153, 12, 1, 1 },
- { 16896, 7706, 3745, 1920, 1608, 734, 146, 11, 1, 1 },
- { 17024, 7699, 3714, 1893, 1575, 711, 140, 10, 1, 1 },
- { 17152, 7690, 3684, 1866, 1541, 689, 134, 10, 1, 1 },
- { 17280, 7681, 3653, 1839, 1508, 668, 128, 9, 1, 1 },
- { 17408, 7671, 3621, 1812, 1476, 647, 122, 9, 1, 1 },
- { 17536, 7660, 3590, 1785, 1444, 626, 117, 8, 1, 1 },
- { 17664, 7648, 3558, 1758, 1412, 606, 112, 8, 1, 1 },
- { 17792, 7635, 3526, 1731, 1381, 587, 107, 7, 1, 1 },
- { 17920, 7622, 3493, 1704, 1350, 568, 102, 7, 1, 1 },
- { 18048, 7607, 3461, 1678, 1319, 549, 98, 6, 1, 1 },
- { 18176, 7592, 3428, 1651, 1289, 531, 93, 6, 1, 1 },
- { 18304, 7575, 3394, 1625, 1259, 514, 89, 6, 1, 1 },
- { 18432, 7558, 3361, 1598, 1230, 497, 85, 5, 1, 1 },
- { 18560, 7540, 3327, 1572, 1201, 480, 81, 5, 1, 1 },
- { 18688, 7520, 3293, 1546, 1173, 464, 77, 5, 1, 1 },
- { 18816, 7500, 3258, 1520, 1145, 448, 74, 5, 1, 1 },
- { 18944, 7480, 3224, 1494, 1117, 433, 70, 4, 1, 1 },
- { 19072, 7458, 3189, 1468, 1090, 418, 67, 4, 1, 1 },
- { 19200, 7435, 3154, 1442, 1063, 404, 64, 4, 1, 1 },
- { 19328, 7410, 3119, 1417, 1037, 390, 61, 4, 1, 1 },
- { 19456, 7386, 3084, 1392, 1011, 376, 58, 3, 1, 1 },
- { 19584, 7361, 3048, 1366, 986, 363, 55, 3, 1, 1 },
- { 19712, 7335, 3012, 1341, 960, 350, 53, 3, 1, 1 },
- { 19840, 7307, 2977, 1316, 936, 337, 50, 3, 1, 1 },
- { 19968, 7279, 2941, 1291, 911, 325, 48, 3, 1, 1 },
- { 20096, 7251, 2905, 1267, 887, 313, 45, 2, 1, 1 },
- { 20224, 7220, 2868, 1243, 864, 302, 43, 2, 1, 1 },
- { 20352, 7189, 2832, 1218, 841, 291, 41, 2, 1, 1 },
- { 20480, 7158, 2795, 1194, 818, 280, 39, 2, 1, 1 },
- { 20608, 7124, 2759, 1170, 796, 270, 37, 2, 1, 1 },
- { 20736, 7091, 2722, 1147, 774, 259, 35, 2, 1, 1 },
- { 20864, 7056, 2685, 1123, 752, 250, 34, 2, 1, 1 },
- { 20992, 7021, 2648, 1100, 731, 240, 32, 2, 1, 1 },
- { 21120, 6985, 2612, 1077, 710, 231, 30, 1, 1, 1 },
- { 21248, 6948, 2574, 1054, 690, 222, 29, 1, 1, 1 },
- { 21376, 6911, 2537, 1031, 670, 213, 27, 1, 1, 1 },
- { 21504, 6872, 2500, 1008, 650, 205, 26, 1, 1, 1 },
- { 21632, 6831, 2463, 986, 631, 197, 25, 1, 1, 1 },
- { 21760, 6791, 2426, 964, 612, 189, 23, 1, 1, 1 },
- { 21888, 6749, 2389, 942, 594, 181, 22, 1, 1, 1 },
- { 22016, 6707, 2351, 921, 575, 174, 21, 1, 1, 1 },
- { 22144, 6663, 2314, 899, 558, 167, 20, 1, 1, 1 },
- { 22272, 6619, 2277, 878, 540, 160, 19, 1, 1, 1 },
- { 22400, 6574, 2240, 857, 523, 153, 18, 1, 1, 1 },
- { 22528, 6529, 2202, 836, 507, 146, 17, 1, 1, 1 },
- { 22656, 6482, 2165, 816, 490, 140, 16, 1, 1, 1 },
- { 22784, 6435, 2128, 795, 474, 134, 15, 1, 1, 1 },
- { 22912, 6386, 2091, 775, 459, 128, 14, 1, 1, 1 },
- { 23040, 6336, 2054, 756, 443, 123, 13, 1, 1, 1 },
- { 23168, 6286, 2017, 736, 428, 117, 13, 1, 1, 1 },
- { 23296, 6234, 1980, 717, 414, 112, 12, 1, 1, 1 },
- { 23424, 6183, 1943, 698, 399, 107, 11, 1, 1, 1 },
- { 23552, 6130, 1906, 679, 385, 102, 11, 1, 1, 1 },
- { 23680, 6077, 1869, 660, 372, 97, 10, 1, 1, 1 },
- { 23808, 6022, 1833, 642, 358, 93, 9, 1, 1, 1 },
- { 23936, 5966, 1796, 624, 345, 89, 9, 1, 1, 1 },
- { 24064, 5910, 1760, 606, 333, 84, 8, 1, 1, 1 },
- { 24192, 5853, 1724, 588, 320, 80, 8, 1, 1, 1 },
- { 24320, 5796, 1687, 571, 308, 76, 7, 1, 1, 1 },
- { 24448, 5735, 1651, 554, 297, 73, 7, 1, 1, 1 },
- { 24576, 5677, 1615, 537, 285, 69, 6, 1, 1, 1 },
- { 24704, 5615, 1579, 521, 274, 66, 6, 1, 1, 1 },
- { 24832, 5554, 1544, 504, 263, 62, 6, 1, 1, 1 },
- { 24960, 5492, 1508, 488, 253, 59, 5, 1, 1, 1 },
- { 25088, 5428, 1473, 473, 242, 56, 5, 1, 1, 1 },
- { 25216, 5364, 1438, 457, 232, 53, 5, 1, 1, 1 },
- { 25344, 5300, 1403, 442, 222, 50, 4, 1, 1, 1 },
- { 25472, 5233, 1368, 427, 213, 48, 4, 1, 1, 1 },
- { 25600, 5166, 1334, 412, 204, 45, 4, 1, 1, 1 },
- { 25728, 5098, 1299, 398, 195, 43, 4, 1, 1, 1 },
- { 25856, 5030, 1266, 384, 186, 40, 3, 1, 1, 1 },
- { 25984, 4960, 1232, 370, 178, 38, 3, 1, 1, 1 },
- { 26112, 4890, 1198, 356, 170, 36, 3, 1, 1, 1 },
- { 26240, 4819, 1164, 343, 162, 34, 3, 1, 1, 1 },
- { 26368, 4748, 1132, 329, 154, 32, 2, 1, 1, 1 },
- { 26496, 4675, 1098, 317, 147, 30, 2, 1, 1, 1 },
- { 26624, 4602, 1066, 304, 139, 28, 2, 1, 1, 1 },
- { 26752, 4527, 1034, 292, 132, 26, 2, 1, 1, 1 },
- { 26880, 4451, 1001, 280, 126, 25, 2, 1, 1, 1 },
- { 27008, 4375, 970, 268, 119, 23, 2, 1, 1, 1 },
- { 27136, 4299, 938, 256, 113, 21, 2, 1, 1, 1 },
- { 27264, 4221, 907, 245, 107, 20, 1, 1, 1, 1 },
- { 27392, 4142, 876, 234, 101, 19, 1, 1, 1, 1 },
- { 27520, 4063, 846, 223, 95, 17, 1, 1, 1, 1 },
- { 27648, 3982, 815, 213, 90, 16, 1, 1, 1, 1 },
- { 27776, 3900, 786, 202, 85, 15, 1, 1, 1, 1 },
- { 27904, 3818, 756, 192, 80, 14, 1, 1, 1, 1 },
- { 28032, 3734, 727, 183, 75, 13, 1, 1, 1, 1 },
- { 28160, 3651, 698, 173, 70, 12, 1, 1, 1, 1 },
- { 28288, 3566, 669, 164, 66, 11, 1, 1, 1, 1 },
- { 28416, 3481, 641, 155, 61, 10, 1, 1, 1, 1 },
- { 28544, 3393, 614, 147, 57, 9, 1, 1, 1, 1 },
- { 28672, 3306, 586, 138, 53, 9, 1, 1, 1, 1 },
- { 28800, 3217, 559, 130, 50, 8, 1, 1, 1, 1 },
- { 28928, 3128, 533, 122, 46, 7, 1, 1, 1, 1 },
- { 29056, 3037, 507, 114, 43, 7, 1, 1, 1, 1 },
- { 29184, 2947, 481, 107, 39, 6, 1, 1, 1, 1 },
- { 29312, 2855, 456, 100, 36, 5, 1, 1, 1, 1 },
- { 29440, 2762, 431, 93, 33, 5, 1, 1, 1, 1 },
- { 29568, 2668, 407, 86, 31, 4, 1, 1, 1, 1 },
- { 29696, 2573, 383, 80, 28, 4, 1, 1, 1, 1 },
- { 29824, 2478, 359, 74, 25, 4, 1, 1, 1, 1 },
- { 29952, 2381, 337, 68, 23, 3, 1, 1, 1, 1 },
- { 30080, 2284, 314, 62, 21, 3, 1, 1, 1, 1 },
- { 30208, 2185, 293, 57, 19, 2, 1, 1, 1, 1 },
- { 30336, 2086, 271, 52, 17, 2, 1, 1, 1, 1 },
- { 30464, 1986, 250, 47, 15, 2, 1, 1, 1, 1 },
- { 30592, 1885, 230, 42, 13, 2, 1, 1, 1, 1 },
- { 30720, 1782, 211, 38, 12, 1, 1, 1, 1, 1 },
- { 30848, 1679, 192, 34, 10, 1, 1, 1, 1, 1 },
- { 30976, 1575, 173, 30, 9, 1, 1, 1, 1, 1 },
- { 31104, 1469, 156, 26, 8, 1, 1, 1, 1, 1 },
- { 31232, 1364, 138, 23, 6, 1, 1, 1, 1, 1 },
- { 31360, 1257, 122, 19, 5, 1, 1, 1, 1, 1 },
- { 31488, 1149, 106, 16, 4, 1, 1, 1, 1, 1 },
- { 31616, 1038, 91, 14, 4, 1, 1, 1, 1, 1 },
- { 31744, 928, 77, 11, 3, 1, 1, 1, 1, 1 },
- { 31872, 816, 64, 9, 2, 1, 1, 1, 1, 1 },
- { 32000, 703, 51, 7, 2, 1, 1, 1, 1, 1 },
- { 32128, 589, 40, 5, 1, 1, 1, 1, 1, 1 },
- { 32256, 473, 29, 4, 1, 1, 1, 1, 1, 1 },
- { 32384, 357, 19, 2, 1, 1, 1, 1, 1, 1 },
- { 32512, 238, 11, 1, 1, 1, 1, 1, 1, 1 },
- { 32640, 117, 4, 1, 1, 1, 1, 1, 1, 1 },
- };
-#endif // CONFIG_NEW_TOKENSET
+#endif // CONFIG_EC_MULTISYMBOL
/* clang-format off */
#if CONFIG_Q_ADAPT_PROBS
@@ -3824,7 +3563,7 @@
},
};
#else
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
static const av1_coeff_probs_model default_coef_probs_4x4[PLANE_TYPES] = {
{ // Y plane
{ // Intra
@@ -4249,7 +3988,7 @@
}
}
};
-#else // CONFIG_NEW_TOKENSET
+#else // CONFIG_EC_MULTISYMBOL
static const av1_coeff_probs_model default_coef_probs_4x4[PLANE_TYPES] = {
{ // Y plane
{ // Intra
@@ -4585,7 +4324,7 @@
}
}
};
-#endif // CONFIG_NEW_TOKENSET
+#endif // CONFIG_EC_MULTISYMBOL
#if CONFIG_TX64X64
// FIXME. Optimize for EC_MULTISYMBOL
@@ -4674,7 +4413,7 @@
};
#endif // CONFIG_TX64X64
#endif // CONFIG_Q_ADAPT_PROBS
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
static const aom_prob av1_default_blockzero_probs[TX_SIZES][PLANE_TYPES]
[REF_TYPES][BLOCKZ_CONTEXTS] = {
{ // TX_4x4
@@ -5915,7 +5654,7 @@
{AOM_ICDF(3009), AOM_ICDF(3246), AOM_ICDF(10158), AOM_ICDF(10533),
AOM_ICDF(32768) } } } }
};
-#endif // CONFIG_NEW_TOKENSET
+#endif // CONFIG_EC_MULTISYMBOL
/* clang-format on */
@@ -5930,7 +5669,7 @@
extend_to_full_distribution(&full[UNCONSTRAINED_NODES], model[PIVOT_NODE]);
}
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
static void build_tail_cdfs(aom_cdf_prob cdf_tail[CDF_SIZE(ENTROPY_TOKENS)],
aom_cdf_prob cdf_head[CDF_SIZE(ENTROPY_TOKENS)],
@@ -6074,19 +5813,6 @@
}
}
-#elif CONFIG_EC_MULTISYMBOL
-static void build_token_cdfs(const aom_prob *pdf_model,
- aom_cdf_prob cdf[ENTROPY_TOKENS + 1]) {
- int i, sum = 0;
- assert(pdf_model[2] != 0);
- for (i = 0; i < ENTROPY_TOKENS - 2; ++i) {
- sum += av1_pareto8_token_probs[pdf_model[2] - 1][i];
- cdf[i] = AOM_ICDF(sum);
- }
-}
-#endif // CONFIG_NEW_TOKENSET
-
-#if CONFIG_EC_MULTISYMBOL
void av1_coef_pareto_cdfs(FRAME_CONTEXT *fc) {
/* Build the tail based on a Pareto distribution */
TX_SIZE t;
@@ -6096,15 +5822,10 @@
for (j = 0; j < REF_TYPES; ++j)
for (k = 0; k < COEF_BANDS; ++k)
for (l = 0; l < BAND_COEFF_CONTEXTS(k); ++l)
-#if CONFIG_NEW_TOKENSET
build_tail_cdfs(fc->coef_tail_cdfs[t][i][j][k][l],
fc->coef_head_cdfs[t][i][j][k][l], k == 0);
-#else
- build_token_cdfs(fc->coef_probs[t][i][j][k][l],
- fc->coef_cdfs[t][i][j][k][l]);
-#endif
}
-#endif
+#endif // CONFIG_EC_MULTISYMBOL
void av1_default_coef_probs(AV1_COMMON *cm) {
#if CONFIG_Q_ADAPT_PROBS
@@ -6123,14 +5844,10 @@
av1_copy(cm->fc->coef_probs[TX_64X64], default_coef_probs_64x64);
#endif // CONFIG_TX64X64
#endif // CONFIG_Q_ADAPT_PROBS
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
av1_copy(cm->fc->blockzero_probs, av1_default_blockzero_probs);
-#endif
-#if CONFIG_NEW_TOKENSET
/* Load the head tokens */
av1_default_coef_cdfs(cm->fc);
-#endif
-#if CONFIG_EC_MULTISYMBOL
av1_coef_pareto_cdfs(cm->fc);
#endif // CONFIG_EC_MULTISYMBOL
}
@@ -6147,13 +5864,13 @@
const unsigned int(*eob_counts)[REF_TYPES][COEF_BANDS][COEFF_CONTEXTS] =
(const unsigned int(*)[REF_TYPES][COEF_BANDS][COEFF_CONTEXTS])
cm->counts.eob_branch[tx_size];
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
const av1_blockz_probs_model *const pre_blockz_probs =
pre_fc->blockzero_probs[tx_size];
av1_blockz_probs_model *const blockz_probs = cm->fc->blockzero_probs[tx_size];
const av1_blockz_count_model *const blockz_counts =
(const av1_blockz_count_model *)&cm->counts.blockz_count[tx_size][0];
-#endif
+#endif // CONFIG_EC_MULTISYMBOL
int i, j, k, l, m;
#if CONFIG_RECT_TX
assert(!is_rect_tx(tx_size));
@@ -6176,7 +5893,7 @@
count_sat, update_factor);
}
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
for (i = 0; i < PLANE_TYPES; ++i) {
for (j = 0; j < REF_TYPES; ++j) {
for (k = 0; k < BLOCKZ_CONTEXTS; ++k) {
@@ -6188,7 +5905,7 @@
}
}
}
-#endif
+#endif // CONFIG_EC_MULTISYMBOL
}
#endif // !CONFIG_LV_MAP
@@ -6246,12 +5963,10 @@
aom_cdf_prob *fc_cdf_ptr;
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
AVERAGE_TILE_CDFS(coef_head_cdfs)
AVERAGE_TILE_CDFS(coef_tail_cdfs)
-#else
- AVERAGE_TILE_CDFS(coef_cdfs)
-#endif
+#endif // CONFIG_EC_MULTISYMBOL
}
void av1_average_tile_mv_cdfs(FRAME_CONTEXT *fc, FRAME_CONTEXT *ec_ctxs[],
diff --git a/av1/common/entropy.h b/av1/common/entropy.h
index ae39ee7..244d313 100644
--- a/av1/common/entropy.h
+++ b/av1/common/entropy.h
@@ -45,7 +45,7 @@
#define CATEGORY5_TOKEN 9 // 35-66 Extra Bits 5+1
#define CATEGORY6_TOKEN 10 // 67+ Extra Bits 14+1
#define EOB_TOKEN 11 // EOB Extra Bits 0+0
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
#define NO_EOB 0 // Not an end-of-block
#define EARLY_EOB 1 // End of block before the last position
#define LAST_EOB 2 // End of block in the last position (implicit)
@@ -56,7 +56,7 @@
#define ONE_TOKEN_NEOB 2
#define TWO_TOKEN_PLUS_EOB 3
#define TWO_TOKEN_PLUS_NEOB 4
-#endif
+#endif // CONFIG_EC_MULTISYMBOL
#define ENTROPY_TOKENS 12
#define ENTROPY_NODES 11
@@ -253,9 +253,8 @@
extern const aom_cdf_prob av1_pareto8_tail_probs[COEFF_PROB_MODELS]
[ENTROPY_TOKENS - 3];
struct frame_contexts;
-#if CONFIG_NEW_TOKENSET
+
void av1_coef_head_cdfs(struct frame_contexts *fc);
-#endif
void av1_coef_pareto_cdfs(struct frame_contexts *fc);
#endif // CONFIG_EC_MULTISYMBOL
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index 31244fd..8e58d90 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -99,13 +99,11 @@
aom_prob partition_prob[PARTITION_CONTEXTS][PARTITION_TYPES - 1];
#endif
av1_coeff_probs_model coef_probs[TX_SIZES][PLANE_TYPES];
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
coeff_cdf_model coef_tail_cdfs[TX_SIZES][PLANE_TYPES];
coeff_cdf_model coef_head_cdfs[TX_SIZES][PLANE_TYPES];
aom_prob blockzero_probs[TX_SIZES][PLANE_TYPES][REF_TYPES][BLOCKZ_CONTEXTS];
-#elif CONFIG_EC_MULTISYMBOL
- coeff_cdf_model coef_cdfs[TX_SIZES][PLANE_TYPES];
-#endif // CONFIG_NEW_TOKENSET
+#endif // CONFIG_EC_MULTISYMBOL
aom_prob switchable_interp_prob[SWITCHABLE_FILTER_CONTEXTS]
[SWITCHABLE_FILTERS - 1];
#if CONFIG_ADAPT_SCAN
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 7b85045..7d13dc3 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2373,7 +2373,7 @@
"Failed to allocate bool decoder %d", 1);
}
-#if !CONFIG_PVQ && !(CONFIG_EC_ADAPT && CONFIG_NEW_TOKENSET) && !CONFIG_LV_MAP
+#if !CONFIG_PVQ && !CONFIG_EC_ADAPT && !CONFIG_LV_MAP
static void read_coef_probs_common(av1_coeff_probs_model *coef_probs,
aom_reader *r) {
int i, j, k, l, m;
@@ -4578,9 +4578,9 @@
av1_read_txb_probs(fc, cm->tx_mode, &r);
#else // CONFIG_LV_MAP
#if !CONFIG_PVQ
-#if !(CONFIG_EC_ADAPT && CONFIG_NEW_TOKENSET)
+#if !CONFIG_EC_ADAPT
read_coef_probs(fc, cm->tx_mode, &r);
-#endif // !(CONFIG_EC_ADAPT && CONFIG_NEW_TOKENSET)
+#endif // !CONFIG_EC_ADAPT
#endif // !CONFIG_PVQ
#endif // CONFIG_LV_MAP
@@ -4736,9 +4736,7 @@
#endif // EC_ADAPT, DAALA_EC
}
#if CONFIG_EC_MULTISYMBOL && !CONFIG_EC_ADAPT
-#if CONFIG_NEW_TOKENSET
av1_coef_head_cdfs(fc);
-#endif
/* Make tail distribution from head */
av1_coef_pareto_cdfs(fc);
for (i = 0; i < NMV_CONTEXTS; ++i) av1_set_mv_cdfs(&fc->nmvc[i]);
diff --git a/av1/decoder/detokenize.c b/av1/decoder/detokenize.c
index 60ceb4b..f86e7fc 100644
--- a/av1/decoder/detokenize.c
+++ b/av1/decoder/detokenize.c
@@ -123,7 +123,7 @@
#endif // CONFIG_AOM_QM
int band, c = 0;
const int tx_size_ctx = txsize_sqr_map[tx_size];
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
aom_cdf_prob(*coef_head_cdfs)[COEFF_CONTEXTS][CDF_SIZE(ENTROPY_TOKENS)] =
ec_ctx->coef_head_cdfs[tx_size_ctx][type][ref];
aom_cdf_prob(*coef_tail_cdfs)[COEFF_CONTEXTS][CDF_SIZE(ENTROPY_TOKENS)] =
@@ -139,14 +139,9 @@
aom_prob(*coef_probs)[COEFF_CONTEXTS][UNCONSTRAINED_NODES] =
ec_ctx->coef_probs[tx_size_ctx][type][ref];
const aom_prob *prob;
-#if CONFIG_EC_MULTISYMBOL
- aom_cdf_prob(*coef_cdfs)[COEFF_CONTEXTS][CDF_SIZE(ENTROPY_TOKENS)] =
- ec_ctx->coef_cdfs[tx_size_ctx][type][ref];
- aom_cdf_prob(*cdf)[CDF_SIZE(ENTROPY_TOKENS)];
-#endif // CONFIG_EC_MULTISYMBOL
unsigned int(*coef_counts)[COEFF_CONTEXTS][UNCONSTRAINED_NODES + 1] = NULL;
unsigned int(*eob_branch_count)[COEFF_CONTEXTS] = NULL;
-#endif // CONFIG_NEW_TOKENSET
+#endif // CONFIG_EC_MULTISYMBOL
uint8_t token_cache[MAX_TX_SQUARE];
const uint8_t *band_translate = get_band_translate(tx_size);
int dq_shift;
@@ -161,18 +156,17 @@
#endif // CONFIG_AOM_QM
if (counts) {
-#if !CONFIG_NEW_TOKENSET || !CONFIG_EC_ADAPT
+#if !CONFIG_EC_MULTISYMBOL
coef_counts = counts->coef[tx_size_ctx][type][ref];
eob_branch_count = counts->eob_branch[tx_size_ctx][type][ref];
-#endif
-#if CONFIG_NEW_TOKENSET && !CONFIG_EC_ADAPT
+#elif !CONFIG_EC_ADAPT
blockz_count = counts->blockz_count[tx_size_ctx][type][ref][ctx];
#endif
}
dq_shift = av1_get_tx_scale(tx_size);
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
band = *band_translate++;
int more_data = 1;
@@ -265,7 +259,7 @@
ctx = get_coef_context(nb, token_cache, c);
band = *band_translate++;
-#else // CONFIG_NEW_TOKENSET
+#else // CONFIG_EC_MULTISYMBOL
while (c < max_eob) {
int val = -1;
band = *band_translate++;
@@ -296,14 +290,6 @@
*max_scan_line = AOMMAX(*max_scan_line, scan[c]);
-#if CONFIG_EC_MULTISYMBOL
- cdf = &coef_cdfs[band][ctx];
- token = ONE_TOKEN +
- aom_read_symbol(r, *cdf, CATEGORY6_TOKEN - ONE_TOKEN + 1, ACCT_STR);
- INCREMENT_COUNT(ONE_TOKEN + (token > ONE_TOKEN));
- assert(token != ZERO_TOKEN);
- val = token_to_value(r, token, tx_size, xd->bd);
-#else // CONFIG_EC_MULTISYMBOL
if (!aom_read(r, prob[ONE_CONTEXT_NODE], ACCT_STR)) {
INCREMENT_COUNT(ONE_TOKEN);
token = ONE_TOKEN;
@@ -315,7 +301,6 @@
assert(token != ZERO_TOKEN && token != ONE_TOKEN);
val = token_to_value(r, token, tx_size, xd->bd);
}
-#endif // CONFIG_EC_MULTISYMBOL
#if CONFIG_NEW_QUANT
v = av1_dequant_abscoeff_nuq(val, dqv, dqv_val);
v = dq_shift ? ROUND_POWER_OF_TWO(v, dq_shift) : v;
@@ -337,7 +322,7 @@
++c;
ctx = get_coef_context(nb, token_cache, c);
dqv = dq[1];
-#endif // CONFIG_NEW_TOKENSET
+#endif // CONFIG_EC_MULTISYMBOL
}
return c;
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index eb444d7..8f8c52f 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -887,7 +887,7 @@
}
#endif
-#if CONFIG_NEW_TOKENSET && !CONFIG_LV_MAP
+#if CONFIG_EC_MULTISYMBOL && !CONFIG_LV_MAP
static void pack_mb_tokens(aom_writer *w, const TOKENEXTRA **tp,
const TOKENEXTRA *const stop,
aom_bit_depth_t bit_depth, const TX_SIZE tx_size,
@@ -951,7 +951,7 @@
*tp = p;
}
-#else // CONFIG_NEW_TOKENSET
+#else // CONFIG_EC_MULTISYMBOL && !CONFIG_LV_MAP
#if !CONFIG_LV_MAP
static void pack_mb_tokens(aom_writer *w, const TOKENEXTRA **tp,
const TOKENEXTRA *const stop,
@@ -1042,7 +1042,7 @@
*tp = p;
}
#endif // !CONFIG_LV_MAP
-#endif // CONFIG_NEW_TOKENSET
+#endif // CONFIG_EC_MULTISYMBOL !CONFIG_LV_MAP
#else // !CONFIG_PVQ
static PVQ_INFO *get_pvq_block(PVQ_QUEUE *pvq_q) {
PVQ_INFO *pvq;
@@ -3113,7 +3113,7 @@
}
#if !CONFIG_LV_MAP
-#if !CONFIG_PVQ && !(CONFIG_EC_ADAPT && CONFIG_NEW_TOKENSET)
+#if !CONFIG_PVQ && !CONFIG_EC_ADAPT
static void build_tree_distribution(AV1_COMP *cpi, TX_SIZE tx_size,
av1_coeff_stats *coef_branch_ct,
av1_coeff_probs_model *coef_probs) {
@@ -3144,7 +3144,7 @@
}
}
-#if !(CONFIG_EC_ADAPT && CONFIG_NEW_TOKENSET)
+#if !CONFIG_EC_ADAPT
static void update_coef_probs_common(aom_writer *const bc, AV1_COMP *cpi,
TX_SIZE tx_size,
av1_coeff_stats *frame_branch_ct,
@@ -3297,7 +3297,7 @@
}
#endif
-#if !(CONFIG_EC_ADAPT && CONFIG_NEW_TOKENSET)
+#if !CONFIG_EC_ADAPT
static void update_coef_probs(AV1_COMP *cpi, aom_writer *w) {
const TX_MODE tx_mode = cpi->common.tx_mode;
const TX_SIZE max_tx_size = tx_mode_to_biggest_tx_size[tx_mode];
@@ -3316,7 +3316,7 @@
}
}
}
-#endif // !(CONFIG_EC_ADAPT && CONFIG_NEW_TOKENSET)
+#endif // !CONFIG_EC_ADAPT
#endif // !CONFIG_EC_ADAPT
#endif // !CONFIG_LV_MAP
@@ -4719,9 +4719,9 @@
av1_write_txb_probs(cpi, header_bc);
#else
#if !CONFIG_PVQ
-#if !(CONFIG_EC_ADAPT && CONFIG_NEW_TOKENSET)
+#if !CONFIG_EC_ADAPT
update_coef_probs(cpi, header_bc);
-#endif // !(CONFIG_EC_ADAPT && CONFIG_NEW_TOKENSET)
+#endif // !CONFIG_EC_ADAPT
#endif // CONFIG_PVQ
#endif // CONFIG_LV_MAP
@@ -4906,9 +4906,7 @@
#endif // CONFIG_GLOBAL_MOTION
}
#if CONFIG_EC_MULTISYMBOL && !CONFIG_EC_ADAPT
-#if CONFIG_NEW_TOKENSET
av1_coef_head_cdfs(fc);
-#endif
av1_coef_pareto_cdfs(fc);
for (i = 0; i < NMV_CONTEXTS; ++i) av1_set_mv_cdfs(&fc->nmvc[i]);
av1_set_mode_cdfs(cm);
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index a6b67c1..f70ab89 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -128,12 +128,12 @@
static INLINE unsigned int get_token_bit_costs(
unsigned int token_costs[2][COEFF_CONTEXTS][ENTROPY_TOKENS], int skip_eob,
int ctx, int token) {
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
(void)skip_eob;
return token_costs[token == ZERO_TOKEN || token == EOB_TOKEN][ctx][token];
#else
return token_costs[skip_eob][ctx][token];
-#endif
+#endif // CONFIG_EC_MULTISYMBOL
}
#define USE_GREEDY_OPTIMIZE_B 0
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 28c9138..b714887 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1104,12 +1104,12 @@
int c, cost;
const int16_t *scan = scan_order->scan;
const int16_t *nb = scan_order->neighbors;
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
const int ref = is_inter_block(mbmi);
aom_prob *blockz_probs =
cm->fc->blockzero_probs[txsize_sqr_map[tx_size]][type][ref];
-#endif // CONFIG_NEW_TOKENSET
+#endif // CONFIG_EC_MULTISYMBOL
#if CONFIG_HIGHBITDEPTH
const int cat6_bits = av1_get_cat6_extrabits_size(tx_size, xd->bd);
@@ -1124,12 +1124,12 @@
(void)cm;
if (eob == 0) {
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
// single eob token
cost = av1_cost_bit(blockz_probs[pt], 0);
#else
cost = token_costs[0][0][pt][EOB_TOKEN];
-#endif // CONFIG_NEW_TOKENSET
+#endif // CONFIG_EC_MULTISYBMOL
} else {
if (use_fast_coef_costing) {
int band_left = *band_count++;
@@ -1138,11 +1138,11 @@
int v = qcoeff[0];
int16_t prev_t;
cost = av1_get_token_cost(v, &prev_t, cat6_bits);
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
cost += (*token_costs)[!prev_t][pt][prev_t];
#else
cost += (*token_costs)[0][pt][prev_t];
-#endif
+#endif // CONFIG_EC_MULTISYMBOL
token_cache[0] = av1_pt_energy_class[prev_t];
++token_costs;
@@ -1154,11 +1154,11 @@
v = qcoeff[rc];
cost += av1_get_token_cost(v, &t, cat6_bits);
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
cost += (*token_costs)[!t][!prev_t][t];
#else
cost += (*token_costs)[!prev_t][!prev_t][t];
-#endif
+#endif // CONFIG_EC_MULTISYMBOL
prev_t = t;
if (!--band_left) {
band_left = *band_count++;
@@ -1167,7 +1167,7 @@
}
// eob token
- if (band_left || CONFIG_NEW_TOKENSET)
+ if (band_left || CONFIG_EC_MULTISYMBOL)
cost += (*token_costs)[0][!prev_t][EOB_TOKEN];
} else { // !use_fast_coef_costing
@@ -1176,22 +1176,22 @@
// dc token
int v = qcoeff[0];
int16_t tok;
-#if !CONFIG_NEW_TOKENSET
+#if !CONFIG_EC_MULTISYMBOL
unsigned int(*tok_cost_ptr)[COEFF_CONTEXTS][ENTROPY_TOKENS];
-#endif
+#endif // !CONFIG_EC_MULTISYMBOL
cost = av1_get_token_cost(v, &tok, cat6_bits);
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
cost += (*token_costs)[!tok][pt][tok];
#else
cost += (*token_costs)[0][pt][tok];
-#endif
+#endif // CONFIG_EC_MULTISYMBOL
token_cache[0] = av1_pt_energy_class[tok];
++token_costs;
-#if !CONFIG_NEW_TOKENSET
+#if !CONFIG_EC_MULTISYMBOL
tok_cost_ptr = &((*token_costs)[!tok]);
-#endif
+#endif // !CONFIG_EC_MULTISYMBOL
// ac tokens
for (c = 1; c < eob; c++) {
@@ -1200,23 +1200,23 @@
v = qcoeff[rc];
cost += av1_get_token_cost(v, &tok, cat6_bits);
pt = get_coef_context(nb, token_cache, c);
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
cost += (*token_costs)[!tok][pt][tok];
#else
cost += (*tok_cost_ptr)[pt][tok];
-#endif
+#endif // CONFIG_EC_MULTISYMBOL
token_cache[rc] = av1_pt_energy_class[tok];
if (!--band_left) {
band_left = *band_count++;
++token_costs;
}
-#if !CONFIG_NEW_TOKENSET
+#if !CONFIG_EC_MULTISYMBOL
tok_cost_ptr = &((*token_costs)[!tok]);
-#endif
+#endif // !CONFIG_EC_MULTISYMBOL
}
// eob token
- if (band_left || CONFIG_NEW_TOKENSET) {
+ if (band_left || CONFIG_EC_MULTISYMBOL) {
pt = get_coef_context(nb, token_cache, c);
cost += (*token_costs)[0][pt][EOB_TOKEN];
}
diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c
index acdd12a..01ca36c 100644
--- a/av1/encoder/tokenize.c
+++ b/av1/encoder/tokenize.c
@@ -314,7 +314,7 @@
blk_row);
}
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
static INLINE void add_token(TOKENEXTRA **t,
aom_cdf_prob (*tail_cdf)[CDF_SIZE(ENTROPY_TOKENS)],
aom_cdf_prob (*head_cdf)[CDF_SIZE(ENTROPY_TOKENS)],
@@ -329,24 +329,18 @@
(*t)++;
}
-#else // CONFIG_NEW_TOKENSET
-static INLINE void add_token(
- TOKENEXTRA **t, const aom_prob *context_tree,
-#if CONFIG_EC_MULTISYMBOL
- aom_cdf_prob (*token_cdf)[CDF_SIZE(ENTROPY_TOKENS)],
-#endif // CONFIG_EC_MULTISYMBOL
- int32_t extra, uint8_t token, uint8_t skip_eob_node, unsigned int *counts) {
+#else // CONFIG_EC_MULTISYMBOL
+static INLINE void add_token(TOKENEXTRA **t, const aom_prob *context_tree,
+ int32_t extra, uint8_t token,
+ uint8_t skip_eob_node, unsigned int *counts) {
(*t)->token = token;
(*t)->extra = extra;
(*t)->context_tree = context_tree;
-#if CONFIG_EC_MULTISYMBOL
- (*t)->token_cdf = token_cdf;
-#endif // CONFIG_EC_MULTISYMBOL
(*t)->skip_eob_node = skip_eob_node;
(*t)++;
++counts[token];
}
-#endif // CONFIG_NEW_TOKENSET
+#endif // CONFIG_EC_MULTISYMBOL
#endif // !CONFIG_PVQ || CONFIG_VAR_TX
#if CONFIG_PALETTE
@@ -471,16 +465,16 @@
const int ref = is_inter_block(mbmi);
unsigned int(*const counts)[COEFF_CONTEXTS][ENTROPY_TOKENS] =
td->rd_counts.coef_counts[txsize_sqr_map[tx_size]][type][ref];
-#if !CONFIG_NEW_TOKENSET
+#if !CONFIG_EC_MULTISYMBOL
aom_prob(*const coef_probs)[COEFF_CONTEXTS][UNCONSTRAINED_NODES] =
cpi->common.fc->coef_probs[txsize_sqr_map[tx_size]][type][ref];
-#endif // !CONFIG_NEW_TOKENSET
+#endif // !CONFIG_EC_MULTISYMBOL
#if CONFIG_EC_ADAPT
FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
#elif CONFIG_EC_MULTISYMBOL
FRAME_CONTEXT *ec_ctx = cpi->common.fc;
#endif
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
aom_cdf_prob(
*const coef_head_cdfs)[COEFF_CONTEXTS][CDF_SIZE(ENTROPY_TOKENS)] =
ec_ctx->coef_head_cdfs[txsize_sqr_map[tx_size]][type][ref];
@@ -492,12 +486,8 @@
int eob_val;
int first_val = 1;
#else
-#if CONFIG_EC_MULTISYMBOL
- aom_cdf_prob(*const coef_cdfs)[COEFF_CONTEXTS][CDF_SIZE(ENTROPY_TOKENS)] =
- ec_ctx->coef_cdfs[txsize_sqr_map[tx_size]][type][ref];
-#endif
int skip_eob = 0;
-#endif
+#endif // CONFIG_EC_MULTISYMBOL
const int seg_eob = get_tx_eob(&cpi->common.seg, segment_id, tx_size);
unsigned int(*const eob_branch)[COEFF_CONTEXTS] =
td->counts->eob_branch[txsize_sqr_map[tx_size]][type][ref];
@@ -511,7 +501,7 @@
nb = scan_order->neighbors;
c = 0;
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
if (eob == 0)
add_token(&t, &coef_tail_cdfs[band[c]][pt], &coef_head_cdfs[band[c]][pt], 1,
1, 0, BLOCK_Z_TOKEN);
@@ -554,11 +544,8 @@
av1_get_token_extra(v, &token, &extra);
- add_token(&t, coef_probs[band[c]][pt],
-#if CONFIG_EC_MULTISYMBOL
- &coef_cdfs[band[c]][pt],
-#endif
- extra, (uint8_t)token, (uint8_t)skip_eob, counts[band[c]][pt]);
+ add_token(&t, coef_probs[band[c]][pt], extra, (uint8_t)token,
+ (uint8_t)skip_eob, counts[band[c]][pt]);
token_cache[scan[c]] = av1_pt_energy_class[token];
++c;
@@ -566,14 +553,11 @@
skip_eob = (token == ZERO_TOKEN);
}
if (c < seg_eob) {
- add_token(&t, coef_probs[band[c]][pt],
-#if CONFIG_EC_MULTISYMBOL
- NULL,
-#endif
- 0, EOB_TOKEN, 0, counts[band[c]][pt]);
+ add_token(&t, coef_probs[band[c]][pt], 0, EOB_TOKEN, 0,
+ counts[band[c]][pt]);
++eob_branch[band[c]][pt];
}
-#endif // CONFIG_NEW_TOKENSET
+#endif // CONFIG_EC_MULTISYMBOL
#if CONFIG_COEF_INTERLEAVE
t->token = EOSB_TOKEN;
diff --git a/av1/encoder/tokenize.h b/av1/encoder/tokenize.h
index 3928111..098d3d1 100644
--- a/av1/encoder/tokenize.h
+++ b/av1/encoder/tokenize.h
@@ -35,14 +35,12 @@
} TOKENVALUE;
typedef struct {
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_EC_MULTISYMBOL
aom_cdf_prob (*tail_cdf)[CDF_SIZE(ENTROPY_TOKENS)];
aom_cdf_prob (*head_cdf)[CDF_SIZE(ENTROPY_TOKENS)];
int eob_val;
int first_val;
-#elif CONFIG_EC_MULTISYMBOL
- aom_cdf_prob (*token_cdf)[CDF_SIZE(ENTROPY_TOKENS)];
-#endif
+#endif // CONFIG_EC_MULTISYMBOL
const aom_prob *context_tree;
EXTRABIT extra;
uint8_t token;
diff --git a/configure b/configure
index 33b0b55..b42f4b4 100755
--- a/configure
+++ b/configure
@@ -267,7 +267,6 @@
supertx
ans
ec_multisymbol
- new_tokenset
loop_restoration
ext_partition
ext_partition_types
@@ -483,7 +482,6 @@
soft_enable ext_tx
soft_enable cdef
soft_enable ec_adapt
- soft_enable new_tokenset
soft_enable ext_intra
soft_enable mv_compress
soft_enable ext_refs
@@ -515,7 +513,6 @@
enabled pvq && enable_feature ec_adapt
enabled cfl && enable_feature ec_multisymbol
enabled ec_adapt && enable_feature ec_multisymbol
- enabled new_tokenset && enable_feature ec_multisymbol
enabled new_multisymbol && enable_feature ec_multisymbol
enabled ec_multisymbol && ! enabled ans && soft_enable daala_ec
enabled ec_multisymbol && ! enabled daala_ec && soft_enable ans
