Remove kf_ctx experiment flag
Change-Id: I829da5fc8007589a1323b49eecf6fa741d51c0e7
diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index e501215..7ec8216 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -1090,11 +1090,9 @@
};
/* clang-format on */
-#if CONFIG_KF_CTX
static const int intra_mode_context[INTRA_MODES] = {
0, 1, 2, 3, 4, 4, 4, 4, 3, 0, 1, 2, 0,
};
-#endif
#if CONFIG_JNT_COMP
// Note: this is also used in unit tests. So whenever one changes the table,
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 23ad7fe..194337b 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -2085,7 +2085,6 @@
};
#endif
-#if CONFIG_KF_CTX
// TODO(jingning): This initial models are copied directly from the entries
// from the original table. The copied indexes are (0, 0), (0, 1), .. (4, 4).
// It is possible to re-train this model and bring back the 0.14% loss in CIF
@@ -2211,717 +2210,7 @@
29653, 30954, 32215) },
},
};
-#endif
-#else
-const aom_cdf_prob
- default_kf_y_mode_cdf[INTRA_MODES][INTRA_MODES][CDF_SIZE(INTRA_MODES)] = {
-#if CONFIG_FILTER_INTRA
- { { AOM_CDF13(14683, 16164, 18655, 19530, 20058, 20712, 21844, 23569,
- 24762, 29323, 30502, 32305) },
- { AOM_CDF13(12656, 20348, 21294, 21804, 22202, 23095, 23587, 24461,
- 25907, 29190, 30652, 31811) },
- { AOM_CDF13(9503, 9951, 23007, 23314, 23541, 23705, 24951, 26524, 26849,
- 29605, 30141, 31999) },
- { AOM_CDF13(13260, 14061, 15139, 17906, 18255, 18765, 19485, 22590,
- 24686, 29535, 30788, 32556) },
- { AOM_CDF13(9636, 10707, 11584, 12180, 19805, 22417, 24821, 25934,
- 26829, 30447, 31325, 32571) },
- { AOM_CDF13(11503, 14182, 15005, 15716, 17312, 22822, 23813, 24939,
- 26485, 30176, 31386, 32491) },
- { AOM_CDF13(10780, 11415, 14363, 14834, 16619, 17205, 23514, 24954,
- 25580, 29808, 30651, 32535) },
- { AOM_CDF13(10987, 11732, 14421, 15496, 15957, 16409, 17580, 23241,
- 24331, 29195, 30353, 32508) },
- { AOM_CDF13(12508, 14242, 15162, 16631, 17071, 17984, 18776, 20784,
- 24151, 29108, 30867, 32444) },
- { AOM_CDF13(12829, 14161, 16064, 16898, 17478, 18230, 19432, 21587,
- 22866, 28544, 30194, 32428) },
- { AOM_CDF13(12573, 14467, 16431, 17241, 17858, 18791, 19760, 21697,
- 22982, 28322, 30394, 32214) },
- { AOM_CDF13(12584, 13813, 16632, 17412, 17891, 18453, 19775, 21906,
- 22973, 28492, 29852, 32414) },
- { AOM_CDF13(10371, 13033, 17420, 17894, 18176, 18567, 19210, 20319,
- 21090, 24048, 25125, 26632) } },
- { { AOM_CDF13(9051, 21642, 22328, 22666, 22990, 24191, 24466, 25094,
- 26458, 29094, 30542, 31304) },
- { AOM_CDF13(5783, 26271, 26458, 26655, 26792, 27507, 27595, 27910,
- 29012, 30270, 31322, 31740) },
- { AOM_CDF13(9084, 14570, 20536, 20922, 21174, 21685, 22190, 23274,
- 24293, 26854, 27998, 29451) },
- { AOM_CDF13(9162, 15547, 16132, 18428, 19036, 19961, 20253, 22111,
- 25468, 28977, 31151, 32108) },
- { AOM_CDF13(6626, 15650, 16281, 16696, 20419, 23826, 24669, 25188,
- 26709, 29561, 31203, 31811) },
- { AOM_CDF13(5946, 17790, 18063, 18339, 19049, 25701, 25942, 26289,
- 28224, 30501, 31732, 32192) },
- { AOM_CDF13(8247, 15710, 16700, 17083, 18600, 19891, 23303, 24149,
- 25418, 28745, 30205, 31229) },
- { AOM_CDF13(7414, 14790, 16103, 17056, 17437, 18332, 18797, 23279,
- 25024, 28630, 30385, 31627) },
- { AOM_CDF13(7886, 17142, 17377, 18228, 18517, 19566, 19789, 20477,
- 26467, 29451, 31424, 32074) },
- { AOM_CDF13(8251, 19430, 19998, 20426, 20782, 22155, 22488, 23281,
- 25037, 28791, 30593, 31614) },
- { AOM_CDF13(8042, 19117, 19777, 20139, 20462, 21878, 22212, 23083,
- 24811, 28090, 30592, 31308) },
- { AOM_CDF13(8268, 19518, 20406, 20756, 21064, 22108, 22552, 23405,
- 25111, 28731, 30343, 31534) },
- { AOM_CDF13(6521, 21472, 22603, 22915, 23041, 23480, 23618, 24110,
- 25099, 26516, 27883, 28449) } },
- { { AOM_CDF13(12527, 13076, 21835, 22214, 22492, 22728, 23978, 25665,
- 26165, 29466, 30247, 32239) },
- { AOM_CDF13(12377, 16820, 21011, 21631, 21960, 22438, 23031, 24350,
- 25400, 28539, 29714, 31154) },
- { AOM_CDF13(6712, 6862, 26853, 26972, 27060, 27103, 27826, 29143, 29267,
- 30799, 31064, 32294) },
- { AOM_CDF13(11320, 11776, 15386, 17447, 17768, 18066, 18973, 23664,
- 25022, 29029, 30158, 32267) },
- { AOM_CDF13(10773, 11905, 15020, 15656, 20247, 21640, 24465, 25777,
- 26419, 29685, 30762, 32481) },
- { AOM_CDF13(12323, 14046, 17449, 18101, 19214, 22210, 23345, 24975,
- 26412, 29729, 30931, 32336) },
- { AOM_CDF13(9944, 10198, 17726, 18052, 18893, 19155, 25498, 26898,
- 27176, 30160, 30652, 32510) },
- { AOM_CDF13(8721, 8970, 16785, 17446, 17649, 17826, 18746, 25927, 26396,
- 29702, 30461, 32528) },
- { AOM_CDF13(11404, 12417, 15834, 17066, 17441, 18014, 18966, 21819,
- 24083, 29077, 30376, 32213) },
- { AOM_CDF13(11450, 11958, 18297, 18820, 19165, 19479, 20809, 23280,
- 23916, 28662, 29933, 32364) },
- { AOM_CDF13(10920, 11607, 17980, 18561, 18921, 19301, 20390, 22706,
- 23413, 28156, 30004, 31872) },
- { AOM_CDF13(11462, 11962, 19642, 20131, 20369, 20530, 21898, 24152,
- 24686, 28899, 29656, 32424) },
- { AOM_CDF13(8171, 9219, 21810, 22146, 22350, 22480, 22930, 24054, 24405,
- 26437, 27109, 28397) } },
- { { AOM_CDF13(12474, 13429, 14740, 17535, 18021, 18752, 19551, 22163,
- 24563, 29410, 30687, 32505) },
- { AOM_CDF13(9862, 15025, 15766, 18942, 19321, 20031, 20492, 21747,
- 25671, 29272, 30926, 32270) },
- { AOM_CDF13(8764, 9426, 17676, 19605, 19945, 20174, 21106, 24312, 25470,
- 29242, 30066, 31831) },
- { AOM_CDF13(8566, 9030, 9692, 18683, 18787, 18968, 19155, 23451, 26278,
- 30299, 31208, 32537) },
- { AOM_CDF13(7535, 8616, 9353, 13056, 18938, 21199, 22627, 23971, 26022,
- 30131, 31243, 32618) },
- { AOM_CDF13(9138, 11001, 11570, 14638, 16000, 20926, 21803, 23237,
- 26287, 30063, 31128, 32599) },
- { AOM_CDF13(9729, 10184, 11919, 13759, 15439, 16099, 20564, 22949,
- 24424, 29313, 30373, 32518) },
- { AOM_CDF13(8615, 9090, 10462, 14832, 15157, 15466, 16143, 22773, 24815,
- 29574, 30593, 32635) },
- { AOM_CDF13(9258, 10308, 10884, 15905, 16092, 16466, 16802, 19277,
- 25235, 29804, 31328, 32508) },
- { AOM_CDF13(10403, 11313, 12386, 15442, 15884, 16549, 17269, 20362,
- 22913, 28783, 30284, 32578) },
- { AOM_CDF13(9620, 10894, 11874, 14923, 15398, 16326, 17076, 20069,
- 23137, 28656, 30608, 32331) },
- { AOM_CDF13(10095, 10981, 12537, 15703, 16165, 16741, 17550, 20754,
- 22975, 29162, 30500, 32582) },
- { AOM_CDF13(8858, 11204, 14847, 18228, 18741, 19060, 19629, 21234,
- 24400, 27622, 29011, 30627) } },
- { { AOM_CDF13(9911, 10689, 11787, 12138, 19892, 22168, 24984, 26365,
- 27052, 30676, 31618, 32577) },
- { AOM_CDF13(10405, 14007, 14667, 15051, 20542, 23567, 25261, 26243,
- 27418, 30244, 31480, 32398) },
- { AOM_CDF13(7972, 8563, 16778, 17053, 20474, 21431, 24348, 26064, 26466,
- 29456, 30241, 31822) },
- { AOM_CDF13(10502, 10858, 11637, 13369, 16831, 18528, 20122, 23814,
- 25350, 29741, 31151, 32539) },
- { AOM_CDF13(4993, 5184, 5393, 5580, 25670, 27769, 29927, 30768, 31020,
- 32139, 32371, 32721) },
- { AOM_CDF13(6994, 8042, 8425, 8775, 18573, 26670, 27998, 29060, 29741,
- 31512, 32140, 32705) },
- { AOM_CDF13(6608, 6893, 7917, 8137, 18180, 19484, 27302, 28268, 28648,
- 31184, 31688, 32604) },
- { AOM_CDF13(7758, 8381, 9673, 10202, 15951, 17361, 19451, 26253, 26891,
- 30394, 31343, 32571) },
- { AOM_CDF13(9961, 11581, 12003, 12812, 17402, 19995, 21609, 23735,
- 25957, 29973, 31339, 32560) },
- { AOM_CDF13(10245, 10965, 11887, 12326, 18409, 20778, 23127, 24779,
- 25560, 30046, 31167, 32588) },
- { AOM_CDF13(9047, 10157, 11136, 11600, 17607, 20541, 22746, 24278,
- 25239, 29844, 31296, 32466) },
- { AOM_CDF13(10318, 11227, 12470, 12792, 17742, 19600, 22120, 24346,
- 25079, 29588, 30917, 32593) },
- { AOM_CDF13(8281, 10602, 15452, 15940, 19120, 20702, 22521, 23526,
- 24236, 27829, 28776, 29973) } },
- { { AOM_CDF13(9850, 12693, 13536, 13937, 16080, 23341, 24177, 25258,
- 26372, 30167, 31506, 32425) },
- { AOM_CDF13(8537, 15828, 16155, 16425, 17738, 25313, 25706, 26423,
- 27642, 30290, 31795, 32372) },
- { AOM_CDF13(8805, 10168, 16679, 17136, 18480, 21724, 22707, 24501,
- 25226, 28734, 29582, 31015) },
- { AOM_CDF13(11887, 13456, 14000, 16402, 17550, 20969, 21942, 24081,
- 26141, 29735, 31365, 32610) },
- { AOM_CDF13(5462, 6783, 7085, 7427, 16960, 26746, 27970, 28609, 29343,
- 31379, 32138, 32593) },
- { AOM_CDF13(4786, 7121, 7242, 7469, 9622, 28427, 28700, 29374, 30121,
- 31764, 32356, 32637) },
- { AOM_CDF13(9172, 10388, 11156, 11527, 15483, 20332, 24727, 25954,
- 26870, 30198, 31246, 32352) },
- { AOM_CDF13(8102, 9847, 11124, 11911, 13567, 18203, 19081, 24364, 25695,
- 29586, 31057, 32380) },
- { AOM_CDF13(10488, 13506, 14020, 14824, 16307, 20899, 21549, 22906,
- 25886, 29488, 31408, 32369) },
- { AOM_CDF13(9407, 11928, 12529, 12941, 14674, 20905, 21782, 23113,
- 24351, 29073, 31009, 32410) },
- { AOM_CDF13(8764, 11728, 12298, 12713, 14609, 21424, 22115, 23419,
- 24779, 29206, 31355, 32390) },
- { AOM_CDF13(9517, 11912, 12950, 13401, 15075, 20426, 21436, 23153,
- 24539, 29531, 31132, 32469) },
- { AOM_CDF13(8253, 12956, 16212, 16664, 17756, 22714, 23216, 24249,
- 25321, 28440, 29620, 30259) } },
- { { AOM_CDF13(11792, 12317, 15563, 16032, 17398, 17977, 23384, 25171,
- 25807, 29850, 30737, 32541) },
- { AOM_CDF13(10922, 14049, 15834, 16386, 17629, 18873, 22496, 24451,
- 25744, 29328, 30878, 32141) },
- { AOM_CDF13(8243, 8431, 19690, 19885, 20402, 20560, 25644, 27470, 27737,
- 30291, 30701, 32380) },
- { AOM_CDF13(11266, 11746, 13215, 15105, 15916, 16497, 19044, 22912,
- 24422, 29451, 30565, 32543) },
- { AOM_CDF13(7970, 8353, 8989, 9324, 18715, 20136, 27478, 28360, 28854,
- 31356, 31910, 32687) },
- { AOM_CDF13(9835, 10905, 11896, 12507, 15383, 20329, 25102, 26520,
- 27487, 30879, 31709, 32540) },
- { AOM_CDF13(6779, 6957, 9270, 9436, 11553, 11824, 27958, 28747, 29030,
- 31268, 31664, 32666) },
- { AOM_CDF13(9125, 9475, 12773, 13383, 14285, 14691, 18620, 24633, 25338,
- 29728, 30582, 32548) },
- { AOM_CDF13(11721, 12709, 14065, 15136, 16224, 17044, 20019, 22634,
- 24974, 29533, 30976, 32540) },
- { AOM_CDF13(11134, 11581, 13908, 14421, 15715, 16407, 20884, 23365,
- 24142, 29151, 30333, 32546) },
- { AOM_CDF13(10621, 11354, 13725, 14331, 15697, 16435, 20811, 23061,
- 23916, 29068, 30630, 32382) },
- { AOM_CDF13(11037, 11497, 14490, 14987, 16009, 16447, 21140, 23683,
- 24312, 28995, 30105, 32639) },
- { AOM_CDF13(9605, 11018, 17444, 17875, 18709, 19288, 22633, 24723,
- 25518, 28726, 29835, 31394) } },
- { { AOM_CDF13(12284, 12942, 15497, 16898, 17400, 17937, 19136, 23012,
- 24306, 29247, 30360, 32526) },
- { AOM_CDF13(11749, 15601, 16892, 18207, 18593, 19416, 20162, 22890,
- 24773, 28978, 30525, 32157) },
- { AOM_CDF13(8357, 8590, 18591, 19354, 19529, 19661, 20764, 25434, 25938,
- 29380, 29919, 32290) },
- { AOM_CDF13(9307, 9623, 10609, 15340, 15587, 15878, 16422, 22905, 25106,
- 29604, 30579, 32561) },
- { AOM_CDF13(9511, 10303, 11146, 12396, 19000, 20742, 22883, 25043,
- 26322, 30216, 31156, 32668) },
- { AOM_CDF13(11525, 12965, 13992, 15314, 16559, 21108, 22323, 24844,
- 26765, 30376, 31351, 32576) },
- { AOM_CDF13(9919, 10382, 13106, 14128, 15212, 15741, 20216, 23213,
- 24169, 29046, 29869, 32570) },
- { AOM_CDF13(8056, 8456, 10218, 11714, 12070, 12383, 12849, 26222, 27079,
- 30222, 30828, 32606) },
- { AOM_CDF13(10700, 11453, 12659, 15291, 15677, 16240, 16902, 20777,
- 24142, 29325, 30729, 32560) },
- { AOM_CDF13(10863, 11450, 13506, 14976, 15428, 15869, 17051, 21294,
- 22705, 28406, 29836, 32553) },
- { AOM_CDF13(10357, 11196, 13312, 14910, 15380, 15977, 16957, 20978,
- 22542, 28263, 30186, 32369) },
- { AOM_CDF13(10325, 10858, 13637, 15045, 15455, 15809, 17144, 21700,
- 22936, 28610, 29747, 32558) },
- { AOM_CDF13(10032, 11356, 16324, 17851, 18191, 18525, 19241, 22933,
- 24078, 27949, 29094, 31080) } },
- { { AOM_CDF13(11187, 13518, 14554, 16266, 16753, 17679, 18282, 19923,
- 24195, 29274, 30823, 32442) },
- { AOM_CDF13(7948, 15152, 15579, 16934, 17200, 18121, 18405, 19130,
- 26141, 29589, 31275, 32270) },
- { AOM_CDF13(8418, 9721, 16634, 18137, 18405, 18791, 19607, 22197, 24804,
- 28838, 29667, 31725) },
- { AOM_CDF13(9661, 10767, 11231, 16796, 16918, 17285, 17685, 20433,
- 25515, 29910, 31128, 32611) },
- { AOM_CDF13(7447, 9631, 10071, 11463, 16405, 18681, 19977, 21135, 25724,
- 30089, 31371, 32429) },
- { AOM_CDF13(7732, 11142, 11643, 13157, 14285, 19050, 19568, 20445,
- 26278, 30197, 31552, 32543) },
- { AOM_CDF13(8655, 9972, 11341, 12647, 14152, 15009, 18424, 20317, 23903,
- 29129, 30367, 32348) },
- { AOM_CDF13(8905, 10161, 11295, 14376, 14751, 15334, 15861, 20676,
- 24144, 29140, 30559, 32518) },
- { AOM_CDF13(7230, 9455, 9769, 12237, 12385, 12718, 12941, 14070, 26774,
- 30020, 31689, 32544) },
- { AOM_CDF13(9676, 11840, 12666, 14444, 14854, 15790, 16395, 18289,
- 23074, 28546, 30570, 32500) },
- { AOM_CDF13(8954, 11507, 12411, 14262, 14736, 15800, 16324, 17931,
- 23370, 28692, 30899, 32304) },
- { AOM_CDF13(9604, 11709, 12728, 14391, 14817, 15784, 16426, 18627,
- 22984, 28781, 30290, 32507) },
- { AOM_CDF13(8037, 12362, 14711, 16445, 16662, 17238, 17667, 18883,
- 24405, 27873, 29300, 30676) } },
- { { AOM_CDF13(12742, 13944, 16005, 16901, 17483, 18249, 19462, 21457,
- 22908, 28575, 30017, 32411) },
- { AOM_CDF13(11299, 16882, 17822, 18576, 19025, 20145, 20676, 21738,
- 23779, 28608, 30479, 32163) },
- { AOM_CDF13(9373, 9807, 20454, 20912, 21134, 21315, 22536, 24523, 25027,
- 28824, 29546, 31958) },
- { AOM_CDF13(10839, 11634, 12609, 15747, 16076, 16521, 17368, 20813,
- 23179, 28736, 30250, 32547) },
- { AOM_CDF13(10018, 11043, 11846, 12631, 18703, 21106, 23223, 24327,
- 25655, 29908, 31108, 32633) },
- { AOM_CDF13(10447, 12670, 13370, 14274, 15751, 20138, 21082, 22289,
- 24356, 29308, 30721, 32473) },
- { AOM_CDF13(10304, 10858, 13242, 13826, 15409, 16080, 21225, 22983,
- 23924, 29128, 30162, 32556) },
- { AOM_CDF13(9909, 10554, 12924, 14243, 14636, 15075, 16202, 21806,
- 23067, 28721, 29942, 32552) },
- { AOM_CDF13(10896, 12565, 13376, 14948, 15378, 16154, 16898, 19033,
- 22710, 28465, 30461, 32462) },
- { AOM_CDF13(11659, 12724, 14290, 15241, 15795, 16545, 17729, 20065,
- 21669, 28045, 29829, 32507) },
- { AOM_CDF13(11351, 12806, 14382, 15343, 15955, 16885, 17916, 20033,
- 21718, 28093, 30166, 32319) },
- { AOM_CDF13(11522, 12494, 14590, 15496, 15977, 16665, 17908, 20267,
- 21743, 28115, 29581, 32452) },
- { AOM_CDF13(9913, 12241, 17367, 18136, 18433, 18985, 19700, 21136,
- 22405, 26910, 28302, 30379) } },
- { { AOM_CDF13(12772, 14653, 16651, 17429, 17957, 18854, 19886, 21672,
- 23234, 28792, 30500, 32399) },
- { AOM_CDF13(10718, 18074, 18913, 19509, 19880, 20951, 21443, 22467,
- 24411, 28546, 30812, 32079) },
- { AOM_CDF13(8668, 9307, 20783, 21169, 21531, 21743, 22862, 24771, 25364,
- 29059, 29920, 31878) },
- { AOM_CDF13(11352, 12585, 13504, 16428, 16801, 17365, 17969, 21427,
- 23868, 29321, 30836, 32622) },
- { AOM_CDF13(9076, 10636, 11637, 12524, 18204, 20593, 22842, 23921,
- 25465, 29951, 31401, 32575) },
- { AOM_CDF13(9924, 12861, 13519, 14327, 15700, 20596, 21434, 22592,
- 24521, 29177, 30937, 32569) },
- { AOM_CDF13(9975, 10926, 13127, 13658, 15283, 16041, 21277, 23058,
- 24139, 29093, 30305, 32527) },
- { AOM_CDF13(9782, 10733, 12976, 14251, 14721, 15295, 16279, 22181,
- 23520, 29134, 30459, 32591) },
- { AOM_CDF13(10910, 13136, 13939, 15246, 15760, 16621, 17278, 19097,
- 23321, 28756, 31030, 32520) },
- { AOM_CDF13(11508, 13079, 14662, 15543, 16088, 16964, 18013, 20126,
- 21886, 28317, 30284, 32446) },
- { AOM_CDF13(11588, 13894, 15463, 16360, 16934, 17975, 18878, 20699,
- 22408, 28392, 30519, 32360) },
- { AOM_CDF13(11198, 12680, 14726, 15620, 16098, 16861, 18056, 20172,
- 21896, 28252, 29839, 32437) },
- { AOM_CDF13(9832, 13268, 17993, 18757, 19173, 19664, 20264, 21689,
- 23011, 27552, 29216, 30566) } },
- { { AOM_CDF13(12350, 13494, 16423, 17219, 17721, 18280, 19569, 21557,
- 22752, 28182, 29360, 32304) },
- { AOM_CDF13(10022, 16315, 17409, 18094, 18533, 19487, 20138, 21179,
- 22977, 27630, 29129, 31612) },
- { AOM_CDF13(9089, 9522, 20772, 21117, 21321, 21492, 22623, 24717, 25118,
- 28517, 28979, 31962) },
- { AOM_CDF13(9995, 10496, 11749, 15264, 15578, 15986, 16825, 20949,
- 23073, 28353, 29869, 32482) },
- { AOM_CDF13(9679, 10801, 11768, 12705, 18527, 20477, 22915, 24165,
- 25268, 29848, 30931, 32576) },
- { AOM_CDF13(9567, 11899, 12955, 13828, 15192, 19318, 20367, 21537,
- 23628, 28952, 30125, 32358) },
- { AOM_CDF13(9977, 10470, 13391, 14019, 15325, 15830, 21218, 23133,
- 23836, 28927, 29755, 32513) },
- { AOM_CDF13(9850, 10345, 13290, 14602, 14927, 15251, 16355, 22136,
- 23237, 28655, 29584, 32430) },
- { AOM_CDF13(10404, 11783, 12735, 14400, 14849, 15513, 16394, 18648,
- 22370, 28254, 30174, 32416) },
- { AOM_CDF13(11468, 12380, 14466, 15450, 15969, 16598, 17836, 20272,
- 21618, 27769, 29346, 32367) },
- { AOM_CDF13(10553, 11978, 13832, 14829, 15388, 16214, 17380, 19633,
- 21295, 27909, 29723, 32101) },
- { AOM_CDF13(11458, 12316, 15258, 16119, 16504, 16926, 18261, 20678,
- 21757, 27964, 29206, 32426) },
- { AOM_CDF13(9827, 12420, 17601, 18357, 18643, 19019, 19747, 21072,
- 22058, 25919, 27042, 29550) } },
- { { AOM_CDF13(9582, 13804, 16310, 16612, 16855, 17317, 17804, 18740,
- 19414, 21959, 22938, 24178) },
- { AOM_CDF13(7931, 20318, 21429, 21817, 21997, 22345, 22526, 23105,
- 23829, 25586, 26598, 27385) },
- { AOM_CDF13(6461, 7883, 22735, 22941, 23061, 23170, 23671, 24830, 25109,
- 26711, 27168, 28668) },
- { AOM_CDF13(9870, 12532, 14896, 17822, 18219, 18649, 19079, 23162,
- 24634, 28800, 30057, 31098) },
- { AOM_CDF13(8170, 13942, 15674, 16236, 20928, 22526, 24154, 25027,
- 26567, 29246, 29882, 31110) },
- { AOM_CDF13(9833, 16669, 17894, 18429, 19535, 23506, 24053, 25052,
- 26466, 29379, 30616, 31424) },
- { AOM_CDF13(9558, 13127, 16722, 16945, 18404, 18965, 23157, 24785,
- 25444, 28879, 29715, 31451) },
- { AOM_CDF13(8656, 11218, 15859, 16851, 17205, 17565, 18231, 24622,
- 25273, 28496, 29332, 31266) },
- { AOM_CDF13(9768, 14291, 15838, 16981, 17225, 18107, 18654, 20335,
- 24118, 28540, 30170, 31448) },
- { AOM_CDF13(10347, 15055, 17791, 18218, 18600, 19290, 19932, 21554,
- 22592, 26896, 28359, 30358) },
- { AOM_CDF13(9093, 14028, 17143, 17521, 17893, 18675, 19203, 20715,
- 21674, 25422, 28036, 29528) },
- { AOM_CDF13(10719, 15009, 18593, 19033, 19256, 19708, 20387, 22033,
- 22877, 26524, 27841, 30214) },
- { AOM_CDF13(6775, 10524, 14225, 14551, 14761, 14914, 15132, 16033,
- 16477, 17963, 18795, 19673) } }
-#else
- {
- { AOM_CDF13(14208, 17049, 20482, 21400, 22520, 23261, 23963, 25010,
- 25828, 28398, 29394, 30738) },
- { AOM_CDF13(10496, 18295, 19872, 20945, 21933, 22818, 23334, 24033,
- 24996, 27652, 29060, 30071) },
- { AOM_CDF13(5120, 6461, 19840, 20310, 21151, 21506, 22535, 23900,
- 24281, 26958, 27680, 29636) },
- { AOM_CDF13(12544, 15177, 17666, 19855, 21147, 22017, 22797, 24514,
- 25779, 28716, 29772, 31267) },
- { AOM_CDF13(7552, 9909, 11908, 13141, 18765, 22029, 23872, 24920,
- 25674, 29031, 30244, 31684) },
- { AOM_CDF13(11008, 15004, 16534, 18158, 21515, 26668, 27834, 28735,
- 30471, 30839, 30969, 31068) },
- { AOM_CDF13(6272, 7963, 11944, 12780, 17944, 19198, 24071, 25295,
- 25834, 29014, 29949, 31733) },
- { AOM_CDF13(8192, 10189, 14596, 15680, 17143, 17909, 19201, 23711,
- 24503, 28207, 29338, 31424) },
- { AOM_CDF13(10752, 13199, 15048, 17151, 18445, 19604, 20363, 21782,
- 24311, 28026, 29517, 30962) },
- { AOM_CDF13(7424, 10301, 13245, 14307, 16021, 16257, 17265, 18739,
- 20080, 26066, 28325, 31184) },
- { AOM_CDF13(6528, 10893, 13773, 14824, 16540, 16926, 17748, 18876,
- 20396, 25974, 28795, 30820) },
- { AOM_CDF13(8704, 11005, 14320, 15349, 16746, 16884, 17887, 19304,
- 20265, 26115, 27672, 31358) },
- { AOM_CDF13(6272, 9504, 15437, 16399, 17355, 17948, 18814, 20270,
- 21134, 23690, 24759, 26454) },
- },
- {
- { AOM_CDF13(3968, 17613, 19125, 19550, 20305, 21908, 22274, 22719,
- 23959, 26970, 29013, 29843) },
- { AOM_CDF13(3072, 21231, 21863, 22306, 22674, 23414, 23517, 23798,
- 24770, 27032, 29016, 29636) },
- { AOM_CDF13(2560, 9825, 15681, 16370, 17054, 17687, 18236, 19273,
- 20311, 24863, 26825, 28756) },
- { AOM_CDF13(6912, 15140, 16485, 18364, 19181, 20394, 20663, 22098,
- 23936, 27555, 29704, 30849) },
- { AOM_CDF13(2944, 13101, 14006, 14974, 17818, 21093, 21930, 22566,
- 24137, 27732, 29814, 30904) },
- { AOM_CDF13(4352, 17824, 18715, 19632, 21519, 26341, 26922, 27575,
- 29863, 30432, 30769, 30881) },
- { AOM_CDF13(2944, 11971, 13509, 14295, 17202, 19005, 21605, 22458,
- 23839, 27774, 29492, 30787) },
- { AOM_CDF13(4224, 13072, 15288, 16406, 17285, 18362, 19003, 21378,
- 22942, 27093, 29381, 30872) },
- { AOM_CDF13(5120, 15375, 16188, 17415, 18183, 19756, 20030, 20883,
- 23935, 27428, 29627, 30608) },
- { AOM_CDF13(2816, 14999, 16352, 16969, 17836, 18125, 18514, 19181,
- 20650, 25773, 29172, 30662) },
- { AOM_CDF13(2560, 16158, 17320, 17839, 18545, 18848, 19130, 19599,
- 20863, 25449, 29304, 30408) },
- { AOM_CDF13(3328, 15146, 16880, 17523, 18340, 18563, 18896, 19582,
- 20944, 25914, 28759, 30583) },
- { AOM_CDF13(2560, 16618, 18460, 19207, 19654, 20276, 20529, 21179,
- 22355, 25423, 27696, 28638) },
- },
- {
- { AOM_CDF13(11392, 12961, 20901, 21544, 22490, 22928, 23888, 25214,
- 25777, 28256, 29102, 30513) },
- { AOM_CDF13(8064, 13595, 18888, 19616, 20765, 21454, 21990, 23103,
- 23980, 26772, 28070, 29197) },
- { AOM_CDF13(4352, 5059, 21705, 22099, 22703, 22846, 23679, 25469,
- 25728, 27919, 28484, 30215) },
- { AOM_CDF13(10752, 12277, 16471, 18276, 19443, 19917, 21158, 23881,
- 24892, 27709, 28771, 30274) },
- { AOM_CDF13(8320, 10000, 14147, 15330, 19197, 20923, 22954, 24541,
- 25285, 28407, 29431, 30953) },
- { AOM_CDF13(11264, 14751, 18517, 20285, 23172, 25970, 27312, 28684,
- 29803, 30242, 30412, 30668) },
- { AOM_CDF13(6528, 7509, 14190, 14953, 17905, 18452, 23074, 24910,
- 25374, 28605, 29542, 31640) },
- { AOM_CDF13(6784, 7644, 15953, 17055, 17945, 18242, 19351, 24705,
- 25365, 28466, 29334, 31245) },
- { AOM_CDF13(8192, 9802, 14519, 15740, 17351, 18084, 18962, 20908,
- 22937, 26847, 28284, 29888) },
- { AOM_CDF13(5888, 7534, 14635, 15436, 16710, 16830, 18000, 19760,
- 20571, 25777, 27649, 30668) },
- { AOM_CDF13(5248, 7364, 14858, 15545, 16861, 17016, 17859, 19384,
- 20237, 25239, 27715, 29865) },
- { AOM_CDF13(6656, 7989, 15472, 16265, 17271, 17334, 18563, 20327,
- 20916, 26173, 27350, 31034) },
- { AOM_CDF13(4480, 6411, 17828, 18611, 19399, 19684, 20504, 21782,
- 22335, 25286, 26352, 28016) },
- },
- {
- { AOM_CDF13(10240, 12819, 15545, 18248, 19779, 20932, 21899, 23377,
- 25448, 28730, 29936, 31536) },
- { AOM_CDF13(7552, 15309, 16645, 19760, 20653, 21650, 22221, 23273,
- 25509, 28683, 30153, 31192) },
- { AOM_CDF13(5248, 6840, 16129, 17940, 19069, 19660, 20588, 22760,
- 23927, 27538, 28397, 30725) },
- { AOM_CDF13(11008, 11903, 13794, 21320, 21931, 22310, 22546, 25375,
- 27347, 29800, 30761, 31833) },
- { AOM_CDF13(6272, 8678, 10313, 13073, 16823, 19980, 21520, 23242,
- 25344, 28797, 30405, 31940) },
- { AOM_CDF13(7424, 10835, 12653, 16345, 19574, 24868, 25937, 27299,
- 31104, 31448, 31580, 31679) },
- { AOM_CDF13(4992, 6458, 9945, 11961, 16136, 17677, 20946, 23042,
- 24475, 28304, 29748, 31791) },
- { AOM_CDF13(9600, 11879, 14703, 17653, 19176, 20185, 20880, 25194,
- 26584, 29655, 30430, 32044) },
- { AOM_CDF13(9856, 11385, 13457, 18705, 19577, 20266, 20746, 22207,
- 26724, 29431, 30645, 31604) },
- { AOM_CDF13(6272, 9318, 11569, 14812, 16351, 16619, 17537, 19596,
- 22025, 27384, 29277, 31422) },
- { AOM_CDF13(5888, 9348, 11416, 14690, 16254, 16633, 17457, 19031,
- 21875, 27080, 29442, 31193) },
- { AOM_CDF13(6912, 9329, 12218, 15177, 16806, 16998, 17991, 20005,
- 21952, 27108, 28867, 31657) },
- { AOM_CDF13(5120, 9098, 13132, 17701, 18739, 19534, 20415, 22136,
- 24213, 27199, 28504, 29960) },
- },
- {
- { AOM_CDF13(7296, 9304, 11772, 12529, 18014, 20418, 23076, 24662,
- 25549, 29074, 30392, 31773) },
- { AOM_CDF13(7168, 11687, 13541, 14431, 18214, 20761, 22269, 23320,
- 24633, 28339, 30193, 31268) },
- { AOM_CDF13(3584, 4428, 13496, 14189, 17372, 18617, 20609, 22615,
- 23270, 27280, 28305, 30602) },
- { AOM_CDF13(7424, 8834, 10499, 14357, 17671, 19150, 20460, 23235,
- 24391, 28351, 29843, 31481) },
- { AOM_CDF13(4480, 5888, 7093, 7902, 18290, 22123, 24511, 25532, 26360,
- 29653, 30954, 32215) },
- { AOM_CDF13(7296, 10176, 11780, 12824, 19608, 25882, 28520, 29445,
- 31106, 31573, 31775, 31872) },
- { AOM_CDF13(3840, 4833, 7551, 8449, 16668, 18614, 23952, 25668, 26721,
- 29888, 30697, 32090) },
- { AOM_CDF13(6528, 8011, 11083, 12427, 16188, 17548, 19625, 23787,
- 24792, 28649, 29872, 31845) },
- { AOM_CDF13(7168, 9170, 10655, 12439, 15550, 18128, 19565, 21412,
- 23355, 28007, 30080, 31568) },
- { AOM_CDF13(5504, 7636, 10174, 11056, 15562, 16252, 17931, 19598,
- 20967, 26845, 29149, 31490) },
- { AOM_CDF13(5248, 7810, 10004, 11015, 15359, 16310, 17834, 19185,
- 20903, 26728, 29585, 31478) },
- { AOM_CDF13(5376, 7322, 10592, 11694, 15586, 16103, 17999, 19740,
- 20950, 26894, 28912, 31591) },
- { AOM_CDF13(4608, 7276, 12153, 13388, 16091, 17970, 19548, 21175,
- 22481, 26543, 28212, 29908) },
- },
- {
- { AOM_CDF13(6656, 12225, 14441, 15158, 19600, 27127, 28221, 29186,
- 30439, 30913, 31135, 31238) },
- { AOM_CDF13(6400, 14608, 15920, 16643, 20149, 27328, 27896, 28672,
- 30227, 30778, 31053, 31120) },
- { AOM_CDF13(3840, 6925, 14671, 15709, 19830, 24216, 25507, 27459,
- 28552, 29569, 29808, 30169) },
- { AOM_CDF13(9600, 13604, 15202, 17530, 20878, 24279, 25278, 28255,
- 30651, 31170, 31343, 31410) },
- { AOM_CDF13(4608, 8535, 9588, 10740, 18673, 27664, 28826, 29828,
- 31081, 31503, 31680, 31778) },
- { AOM_CDF13(4864, 10543, 11313, 12197, 16785, 27858, 28556, 29480,
- 30892, 31486, 31722, 31787) },
- { AOM_CDF13(3968, 7492, 10283, 11318, 18486, 24061, 26761, 28456,
- 30126, 30872, 31088, 31305) },
- { AOM_CDF13(6016, 10246, 12999, 15083, 18769, 22398, 23584, 27098,
- 29574, 30609, 30898, 31200) },
- { AOM_CDF13(7808, 13404, 14723, 16413, 20186, 24739, 25407, 27106,
- 29929, 30507, 30827, 30915) },
- { AOM_CDF13(2816, 6530, 8123, 9240, 12536, 17593, 18754, 20319, 22070,
- 27037, 29332, 30779) },
- { AOM_CDF13(2432, 6577, 8010, 9215, 12657, 18898, 19588, 20953, 22766,
- 27231, 29927, 31109) },
- { AOM_CDF13(3200, 6974, 9162, 10450, 13818, 17757, 19119, 20842,
- 22269, 27170, 29271, 30804) },
- { AOM_CDF13(4480, 10689, 15307, 16589, 19738, 24416, 25332, 26541,
- 28634, 29711, 29913, 30116) },
- },
- {
- { AOM_CDF13(9600, 11066, 15832, 16515, 18844, 19883, 24302, 25759,
- 26358, 29290, 30262, 31682) },
- { AOM_CDF13(8832, 12814, 16171, 17041, 19066, 20145, 22933, 24074,
- 25006, 28115, 29722, 30991) },
- { AOM_CDF13(3840, 4486, 15821, 16330, 18461, 18879, 22436, 25051,
- 25443, 28637, 29396, 31412) },
- { AOM_CDF13(9856, 10863, 14050, 15920, 18783, 19531, 22502, 24577,
- 25361, 28559, 29600, 31336) },
- { AOM_CDF13(6528, 7620, 10182, 11199, 17281, 19946, 23885, 25333,
- 26130, 29425, 30332, 31948) },
- { AOM_CDF13(9728, 11821, 13954, 15233, 19855, 24478, 28675, 29878,
- 31238, 31741, 31874, 32048) },
- { AOM_CDF13(5120, 5753, 9673, 10149, 14343, 15190, 24967, 26378,
- 26841, 29749, 30527, 32120) },
- { AOM_CDF13(5888, 6606, 11498, 12538, 14737, 15425, 19549, 24047,
- 24765, 28711, 29822, 32138) },
- { AOM_CDF13(10368, 11757, 14126, 15474, 18311, 19358, 21539, 23451,
- 25034, 28791, 30035, 31280) },
- { AOM_CDF13(6016, 7623, 11378, 12248, 15171, 15459, 18958, 20875,
- 21955, 27411, 29196, 31723) },
- { AOM_CDF13(5760, 7469, 11399, 12323, 15165, 15528, 18804, 20769,
- 21767, 27129, 29435, 31502) },
- { AOM_CDF13(7040, 8295, 12298, 13035, 15194, 15357, 18976, 21100,
- 21805, 26978, 28342, 31763) },
- { AOM_CDF13(5632, 7465, 14220, 15035, 17014, 18105, 21111, 23027,
- 23934, 27207, 28293, 30330) },
- },
- {
- { AOM_CDF13(11008, 13089, 17144, 18425, 19954, 20624, 21658, 24229,
- 25290, 28803, 29938, 31493) },
- { AOM_CDF13(9088, 14218, 16378, 17699, 18935, 19928, 20524, 22781,
- 24155, 27523, 29068, 30270) },
- { AOM_CDF13(6144, 7194, 17912, 18991, 19879, 20151, 21170, 23938,
- 24712, 27763, 28556, 30584) },
- { AOM_CDF13(10496, 11614, 13652, 16928, 18425, 18967, 19724, 23817,
- 25594, 28685, 29734, 30941) },
- { AOM_CDF13(7296, 8915, 11163, 13821, 16951, 18507, 20180, 22423,
- 24017, 28294, 29614, 31673) },
- { AOM_CDF13(9728, 13441, 15858, 18860, 21713, 24478, 25995, 28233,
- 30347, 30853, 31081, 31328) },
- { AOM_CDF13(6400, 7480, 11482, 13206, 16199, 16908, 20436, 23507,
- 24650, 28360, 29438, 31532) },
- { AOM_CDF13(9856, 10979, 13430, 15195, 15957, 16350, 16871, 26198,
- 26991, 29612, 30438, 31962) },
- { AOM_CDF13(8960, 10529, 12640, 15350, 16987, 17859, 18590, 21400,
- 23812, 28188, 29589, 31280) },
- { AOM_CDF13(7168, 8877, 12393, 14015, 15655, 15794, 16814, 19923,
- 21086, 26723, 28669, 31468) },
- { AOM_CDF13(6400, 8900, 12241, 13828, 15513, 15671, 16500, 19257,
- 20456, 25984, 28658, 31017) },
- { AOM_CDF13(7296, 8820, 12885, 14441, 15813, 15911, 16954, 20026,
- 20950, 26563, 28140, 31673) },
- { AOM_CDF13(6272, 8455, 13328, 15907, 17026, 17464, 18267, 21436,
- 22712, 26403, 27660, 29559) },
- },
- {
- { AOM_CDF13(6784, 11216, 13269, 15677, 16931, 18445, 19097, 20082,
- 24298, 28236, 30118, 31448) },
- { AOM_CDF13(5760, 13240, 14110, 16966, 17743, 18916, 19281, 19848,
- 25552, 28646, 30444, 31291) },
- { AOM_CDF13(4352, 6870, 14660, 16597, 17361, 18126, 18852, 20765,
- 23526, 27670, 29096, 31214) },
- { AOM_CDF13(9472, 11736, 13172, 18192, 19070, 19651, 19991, 21793,
- 26005, 29291, 30500, 31767) },
- { AOM_CDF13(4480, 7252, 8651, 12379, 14936, 17493, 18326, 19527,
- 23655, 28031, 29960, 31773) },
- { AOM_CDF13(6016, 11561, 12864, 15793, 18765, 23040, 23640, 24415,
- 31040, 31473, 31740, 31827) },
- { AOM_CDF13(4480, 6825, 8810, 11269, 14257, 15716, 18397, 20006,
- 24020, 28230, 29780, 31773) },
- { AOM_CDF13(6912, 9466, 11717, 15159, 16237, 17145, 17814, 21258,
- 24754, 28864, 30313, 32061) },
- { AOM_CDF13(7680, 10517, 11381, 16202, 16809, 17425, 17774, 18764,
- 26842, 29600, 31073, 31886) },
- { AOM_CDF13(4992, 8626, 10531, 13103, 14495, 14784, 15365, 16657,
- 21051, 27011, 29685, 31574) },
- { AOM_CDF13(4736, 9433, 10981, 13494, 14644, 15043, 15396, 16378,
- 21506, 26869, 29824, 31454) },
- { AOM_CDF13(5760, 9526, 11905, 14476, 15722, 16103, 16768, 18070,
- 21630, 27401, 29592, 31818) },
- { AOM_CDF13(4480, 9947, 12386, 15909, 16496, 17397, 17866, 18927,
- 24408, 27750, 29614, 30889) },
- },
- {
- { AOM_CDF13(7424, 10538, 14098, 14891, 16486, 16756, 17607, 18952,
- 20168, 26275, 28617, 31580) },
- { AOM_CDF13(5376, 13070, 14969, 15848, 17197, 17447, 17954, 18747,
- 20137, 25628, 28753, 30628) },
- { AOM_CDF13(3584, 5287, 16141, 16840, 17670, 17760, 18532, 20387,
- 21102, 26118, 27535, 30830) },
- { AOM_CDF13(7424, 9594, 11770, 14505, 16234, 16365, 17201, 20286,
- 22128, 27371, 29426, 31580) },
- { AOM_CDF13(5632, 8393, 10566, 11917, 16025, 16697, 18123, 19541,
- 21135, 27059, 29325, 31814) },
- { AOM_CDF13(3840, 7916, 9526, 11010, 14114, 18169, 19510, 21031,
- 23083, 27769, 29782, 31299) },
- { AOM_CDF13(5376, 7338, 10657, 11699, 14780, 15070, 18291, 20170,
- 21347, 26985, 28811, 31805) },
- { AOM_CDF13(5632, 7669, 11558, 12653, 13962, 14116, 15074, 19886,
- 21123, 26953, 28755, 31708) },
- { AOM_CDF13(6528, 9739, 11612, 13211, 14992, 15237, 16016, 17677,
- 20588, 26647, 29116, 31435) },
- { AOM_CDF13(5376, 8346, 11022, 11976, 13541, 13749, 14520, 16173,
- 17567, 25182, 28111, 31591) },
- { AOM_CDF13(4736, 8894, 11294, 12220, 13753, 14029, 14645, 16065,
- 17621, 24911, 28655, 31344) },
- { AOM_CDF13(5760, 8193, 11667, 12461, 13880, 14040, 14946, 16537,
- 17642, 25117, 27333, 31713) },
- { AOM_CDF13(4096, 8479, 13751, 14813, 15994, 16157, 16905, 18314,
- 19575, 25132, 27445, 30192) },
- },
- {
- { AOM_CDF13(7936, 12263, 15558, 16331, 17779, 18148, 18810, 19794,
- 21046, 26644, 29417, 31507) },
- { AOM_CDF13(5376, 15025, 16457, 17074, 18079, 18299, 18648, 19240,
- 20612, 25687, 29392, 30842) },
- { AOM_CDF13(3840, 6037, 17465, 18089, 18869, 18953, 19688, 21223,
- 21816, 26562, 28195, 30621) },
- { AOM_CDF13(8448, 11255, 13307, 15676, 17392, 17603, 18268, 20783,
- 22646, 27628, 29737, 31628) },
- { AOM_CDF13(5760, 9119, 11015, 12269, 16280, 17023, 18282, 19418,
- 21325, 27309, 30004, 31818) },
- { AOM_CDF13(3968, 9094, 10606, 12007, 14218, 18911, 20089, 20924,
- 23587, 27808, 30253, 31305) },
- { AOM_CDF13(6016, 8627, 11201, 12200, 15305, 15671, 18639, 20185,
- 21627, 26990, 29449, 31723) },
- { AOM_CDF13(6272, 8768, 12320, 13296, 14643, 14970, 15760, 20545,
- 21863, 27473, 29535, 31836) },
- { AOM_CDF13(6912, 10905, 12656, 14084, 15705, 16069, 16674, 17779,
- 21041, 26586, 29539, 31253) },
- { AOM_CDF13(5248, 9672, 12113, 12871, 14423, 14710, 15376, 16708,
- 18092, 25260, 28991, 31585) },
- { AOM_CDF13(4736, 10789, 13029, 13750, 15040, 15385, 15840, 16887,
- 18393, 25230, 29558, 31454) },
- { AOM_CDF13(6016, 9916, 12938, 13741, 15030, 15297, 16116, 17333,
- 18672, 25954, 28498, 31618) },
- { AOM_CDF13(4608, 10266, 15450, 16299, 17114, 17288, 17775, 18835,
- 20227, 25199, 28098, 30018) },
- },
- {
- { AOM_CDF13(7296, 9951, 14124, 14806, 16181, 16377, 17485, 19069,
- 20078, 26051, 27777, 31574) },
- { AOM_CDF13(5376, 13823, 15889, 16620, 17709, 17881, 18327, 19140,
- 20374, 25685, 28160, 30521) },
- { AOM_CDF13(3200, 4602, 16404, 17042, 17780, 17829, 18706, 20608,
- 21115, 25884, 26960, 30804) },
- { AOM_CDF13(7040, 9444, 11770, 14321, 15951, 16074, 17033, 20352,
- 22301, 27567, 29151, 31662) },
- { AOM_CDF13(6016, 8316, 10849, 12136, 15860, 16430, 17935, 19659,
- 21083, 26968, 28839, 31618) },
- { AOM_CDF13(3840, 7472, 9436, 11038, 13625, 17596, 18959, 20543,
- 22879, 27487, 29351, 31186) },
- { AOM_CDF13(5376, 7117, 11424, 12381, 14823, 15053, 18656, 20818,
- 21722, 27042, 28233, 31591) },
- { AOM_CDF13(5760, 7281, 11910, 12912, 14229, 14391, 15474, 20113,
- 21128, 26627, 28077, 31713) },
- { AOM_CDF13(6656, 9452, 11526, 13288, 14861, 15062, 15909, 17695,
- 20429, 26225, 28603, 31340) },
- { AOM_CDF13(5376, 7722, 10921, 11813, 13222, 13348, 14211, 15976,
- 17110, 24634, 27176, 31484) },
- { AOM_CDF13(4736, 8226, 11137, 11988, 13518, 13706, 14332, 16016,
- 17301, 24641, 27704, 31016) },
- { AOM_CDF13(5760, 7592, 11880, 12612, 13738, 13813, 14681, 16392,
- 17306, 24619, 26334, 31818) },
- { AOM_CDF13(4096, 8524, 14316, 15392, 16295, 16433, 17197, 18718,
- 19924, 25123, 26953, 29856) },
- },
- {
- { AOM_CDF13(6528, 13383, 17642, 18342, 19224, 20209, 20899, 21944,
- 23137, 25966, 27429, 28463) },
- { AOM_CDF13(4480, 16901, 18876, 19560, 20257, 20912, 21169, 21959,
- 23036, 25781, 27676, 28569) },
- { AOM_CDF13(2688, 5337, 18178, 18829, 19344, 19628, 20267, 22135,
- 22671, 25817, 26914, 28773) },
- { AOM_CDF13(8192, 11378, 14742, 17269, 18230, 19001, 19655, 22949,
- 24337, 28025, 29503, 30848) },
- { AOM_CDF13(5120, 10133, 13144, 14374, 17020, 18920, 20235, 21677,
- 23142, 27131, 28671, 30284) },
- { AOM_CDF13(7424, 15588, 18431, 19723, 21455, 24705, 25461, 26753,
- 28923, 29475, 29729, 29897) },
- { AOM_CDF13(4224, 8689, 13024, 13658, 16637, 17307, 20836, 22665,
- 23673, 27015, 28310, 30203) },
- { AOM_CDF13(5120, 7896, 13618, 14900, 15708, 16153, 16997, 23625,
- 24466, 27719, 28892, 30500) },
- { AOM_CDF13(5760, 11305, 13669, 15462, 16564, 17683, 18252, 20073,
- 22917, 27005, 28923, 30236) },
- { AOM_CDF13(4224, 9510, 13787, 14587, 15753, 15925, 16513, 18193,
- 19490, 24944, 27482, 29757) },
- { AOM_CDF13(3840, 10052, 14106, 14887, 15827, 15996, 16522, 17939,
- 19204, 24508, 27661, 29491) },
- { AOM_CDF13(4736, 9676, 14492, 15163, 16179, 16390, 17133, 18905,
- 19864, 25185, 27191, 30030) },
- { AOM_CDF13(3584, 9370, 14746, 15820, 16708, 17224, 17718, 19329,
- 20405, 23541, 25258, 26726) },
- },
-#endif
- };
-#endif // CONFIG_KF_CTX
+#endif // CONFIG_FILTER_INTRA
#if CONFIG_EXT_INTRA_MOD
static const aom_cdf_prob default_angle_delta_cdf[DIRECTIONAL_MODES][CDF_SIZE(
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index cfb57dd..5919346 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -57,9 +57,7 @@
// 4096(BLOCK_64X64) -> 8
#define PALATTE_BSIZE_CTXS 9
-#if CONFIG_KF_CTX
#define KF_MODE_CONTEXTS 5
-#endif
// A define to configure whether 4:1 and 1:4 partitions are allowed for 128x128
// blocks. They seem not to be giving great results (and might be expensive to
@@ -176,16 +174,12 @@
#endif
aom_cdf_prob switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS]
[CDF_SIZE(SWITCHABLE_FILTERS)];
-/* kf_y_cdf is discarded after use, so does not require persistent storage.
- However, we keep it with the other CDFs in this struct since it needs to
- be copied to each tile to support parallelism just like the others.
-*/
-#if CONFIG_KF_CTX
+ /* kf_y_cdf is discarded after use, so does not require persistent storage.
+ However, we keep it with the other CDFs in this struct since it needs to
+ be copied to each tile to support parallelism just like the others.
+ */
aom_cdf_prob kf_y_cdf[KF_MODE_CONTEXTS][KF_MODE_CONTEXTS]
[CDF_SIZE(INTRA_MODES)];
-#else
- aom_cdf_prob kf_y_cdf[INTRA_MODES][INTRA_MODES][CDF_SIZE(INTRA_MODES)];
-#endif
#if CONFIG_EXT_INTRA_MOD
aom_cdf_prob angle_delta_cdf[DIRECTIONAL_MODES]
@@ -215,11 +209,7 @@
// Note: This structure should only contain 'unsigned int' fields, or
// aggregates built solely from 'unsigned int' fields/elements
#if CONFIG_ENTROPY_STATS
-#if CONFIG_KF_CTX
unsigned int kf_y_mode[KF_MODE_CONTEXTS][KF_MODE_CONTEXTS][INTRA_MODES];
-#else
- unsigned int kf_y_mode[INTRA_MODES][INTRA_MODES][INTRA_MODES];
-#endif
unsigned int angle_delta[DIRECTIONAL_MODES][2 * MAX_ANGLE_DELTA + 1];
unsigned int y_mode[BLOCK_SIZE_GROUPS][INTRA_MODES];
#if CONFIG_CFL
@@ -323,14 +313,9 @@
#endif // CONFIG_FILTER_INTRA
} FRAME_COUNTS;
-#if CONFIG_KF_CTX
extern const aom_cdf_prob default_kf_y_mode_cdf[KF_MODE_CONTEXTS]
[KF_MODE_CONTEXTS]
[CDF_SIZE(INTRA_MODES)];
-#else
-extern const aom_cdf_prob default_kf_y_mode_cdf[INTRA_MODES][INTRA_MODES]
- [CDF_SIZE(INTRA_MODES)];
-#endif
// Decides what set to assign to 16x16 transforms.
// Set 0:
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 4179ec7..fd5c6cb 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -925,14 +925,9 @@
const MODE_INFO *left_mi) {
const PREDICTION_MODE above = av1_above_block_mode(above_mi);
const PREDICTION_MODE left = av1_left_block_mode(left_mi);
-
-#if CONFIG_KF_CTX
- int above_ctx = intra_mode_context[above];
- int left_ctx = intra_mode_context[left];
+ const int above_ctx = intra_mode_context[above];
+ const int left_ctx = intra_mode_context[left];
return tile_ctx->kf_y_cdf[above_ctx][left_ctx];
-#else
- return tile_ctx->kf_y_cdf[above][left];
-#endif
}
static INLINE void update_partition_context(MACROBLOCKD *xd, int mi_row,
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 82dd7e1..d8e9267 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -815,13 +815,9 @@
#if CONFIG_ENTROPY_STATS
const PREDICTION_MODE above = av1_above_block_mode(above_mi);
const PREDICTION_MODE left = av1_left_block_mode(left_mi);
-#if CONFIG_KF_CTX
- int above_ctx = intra_mode_context[above];
- int left_ctx = intra_mode_context[left];
+ const int above_ctx = intra_mode_context[above];
+ const int left_ctx = intra_mode_context[left];
++counts->kf_y_mode[above_ctx][left_ctx][y_mode];
-#else
- ++counts->kf_y_mode[above][left][y_mode];
-#endif
#endif // CONFIG_ENTROPY_STATS
if (allow_update_cdf)
update_cdf(get_y_mode_cdf(fc, above_mi, left_mi), y_mode, INTRA_MODES);
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 8db6bb8..3413184 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -127,15 +127,9 @@
av1_cost_tokens_from_cdf(x->skip_cost[i], fc->skip_cdfs[i], NULL);
}
-#if CONFIG_KF_CTX
for (i = 0; i < KF_MODE_CONTEXTS; ++i)
for (j = 0; j < KF_MODE_CONTEXTS; ++j)
av1_cost_tokens_from_cdf(x->y_mode_costs[i][j], fc->kf_y_cdf[i][j], NULL);
-#else
- for (i = 0; i < INTRA_MODES; ++i)
- for (j = 0; j < INTRA_MODES; ++j)
- av1_cost_tokens_from_cdf(x->y_mode_costs[i][j], fc->kf_y_cdf[i][j], NULL);
-#endif
for (i = 0; i < BLOCK_SIZE_GROUPS; ++i)
av1_cost_tokens_from_cdf(x->mbmode_cost[i], fc->y_mode_cdf[i], NULL);
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 79a1631..0e66128 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -3436,14 +3436,9 @@
const MODE_INFO *left_mi = xd->left_mi;
const PREDICTION_MODE A = av1_above_block_mode(above_mi);
const PREDICTION_MODE L = av1_left_block_mode(left_mi);
-
-#if CONFIG_KF_CTX
const int above_ctx = intra_mode_context[A];
const int left_ctx = intra_mode_context[L];
bmode_costs = x->y_mode_costs[above_ctx][left_ctx];
-#else
- bmode_costs = x->y_mode_costs[A][L];
-#endif
mbmi->angle_delta[0] = 0;
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH)
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 177c541..e82c348 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -128,7 +128,6 @@
set(CONFIG_INTRABC 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_INTRA_EDGE 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_JNT_COMP 0 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_KF_CTX 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_LOOPFILTERING_ACROSS_TILES 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_LOOPFILTERING_ACROSS_TILES_EXT 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_LOOPFILTER_LEVEL 1 CACHE NUMBER "AV1 experiment flag.")
diff --git a/tools/aom_entropy_optimizer.c b/tools/aom_entropy_optimizer.c
index 8019e02..9338388 100644
--- a/tools/aom_entropy_optimizer.c
+++ b/tools/aom_entropy_optimizer.c
@@ -274,8 +274,7 @@
int cts_each_dim[10];
-/* Intra mode (keyframe luma) */
-#if CONFIG_KF_CTX
+ /* Intra mode (keyframe luma) */
cts_each_dim[0] = KF_MODE_CONTEXTS;
cts_each_dim[1] = KF_MODE_CONTEXTS;
cts_each_dim[2] = INTRA_MODES;
@@ -283,15 +282,6 @@
"const aom_cdf_prob\n"
"default_kf_y_mode_cdf[KF_MODE_CONTEXTS][KF_MODE_CONTEXTS]"
"[CDF_SIZE(INTRA_MODES)]");
-#else
- cts_each_dim[0] = INTRA_MODES;
- cts_each_dim[1] = INTRA_MODES;
- cts_each_dim[2] = INTRA_MODES;
- optimize_cdf_table(
- &fc.kf_y_mode[0][0][0], probsfile, 3, cts_each_dim,
- "const aom_cdf_prob\n"
- "default_kf_y_mode_cdf[INTRA_MODES][INTRA_MODES][CDF_SIZE(INTRA_MODES)]");
-#endif
cts_each_dim[0] = DIRECTIONAL_MODES;
cts_each_dim[1] = 2 * MAX_ANGLE_DELTA + 1;
