Context training-v1 on AVM-v1

STATS_CHANGED
diff --git a/av1/common/entropy_inits_coeffs.h b/av1/common/entropy_inits_coeffs.h
index ae121e6..4ab2b12 100644
--- a/av1/common/entropy_inits_coeffs.h
+++ b/av1/common/entropy_inits_coeffs.h
@@ -22,170 +22,170 @@
 
 static const aom_cdf_prob av1_default_eob_multi16_cdfs[4][3][CDF_SIZE(5)] = {
   {
-    { AOM_CDF5( 1413,  1933,  3768,  9455),   6 },
-    { AOM_CDF5( 1954,  2400,  4205,  7753),   5 },
-    { AOM_CDF5( 9359, 11741, 16061, 22179),  31 },
+    { AOM_CDF5( 1946,  3059,  6834, 15123),   6 },
+    { AOM_CDF5(  558,   835,  2739,  6534),  25 },
+    { AOM_CDF5( 8000, 10366, 14466, 19569),  31 },
   },
   {
-    { AOM_CDF5( 2832,  4201,  8578, 17754),  30 },
-    { AOM_CDF5( 4563,  5208,  7444, 11962),   5 },
-    { AOM_CDF5(10524, 13197, 18032, 24922),   5 },
+    { AOM_CDF5( 1839,  2995,  6796, 15126),  30 },
+    { AOM_CDF5( 1354,  1787,  4813,  9327),  30 },
+    { AOM_CDF5( 8298, 11869, 17297, 24569),  30 },
   },
   {
-    { AOM_CDF5( 4390,  6907, 13987, 24674),  30 },
-    { AOM_CDF5( 1870,  2463,  3813,  9299),   0 },
-    { AOM_CDF5(15137, 18012, 23056, 29705),   0 },
+    { AOM_CDF5( 3946,  6406, 13325, 26004),  30 },
+    { AOM_CDF5( 2616,  3402,  7857, 13406),  30 },
+    { AOM_CDF5(13678, 17362, 23556, 28557),  30 },
   },
   {
-    { AOM_CDF5( 5508, 11837, 26327, 32095),  31 },
-    { AOM_CDF5( 6554,  8738, 10923, 24030),   0 },
-    { AOM_CDF5(28607, 29647, 32421, 32595),  31 },
+    { AOM_CDF5( 5029, 12046, 26017, 32453),  31 },
+    { AOM_CDF5( 3860,  5738,  8894, 18233),  31 },
+    { AOM_CDF5(29060, 30345, 32212, 32705),  27 },
   },
 };
 
 static const aom_cdf_prob av1_default_eob_multi32_cdfs[4][3][CDF_SIZE(6)] = {
   {
-    { AOM_CDF6( 1183,  1539,  2981,  7359, 12851),  31 },
-    { AOM_CDF6( 1847,  2098,  2631,  4422,  9368),   5 },
-    { AOM_CDF6(14803, 16649, 20616, 25021, 29117),  31 },
+    { AOM_CDF6( 1203,  1920,  4502, 10281, 17078),   6 },
+    { AOM_CDF6( 1078,  1340,  2464,  5152, 11416),   5 },
+    { AOM_CDF6(11670, 14271, 19287, 23919, 27084),  31 },
   },
   {
-    { AOM_CDF6( 2170,  3095,  6309, 12580, 18493),  31 },
-    { AOM_CDF6( 1194,  1592,  2551,  4712,  9835),   6 },
-    { AOM_CDF6(12842, 15056, 19310, 24033, 29143),  31 },
+    { AOM_CDF6( 1143,  1778,  3854,  8166, 13337),  31 },
+    { AOM_CDF6( 1109,  1433,  2804,  5652, 11224),  31 },
+    { AOM_CDF6( 8685, 11412, 16486, 22345, 27930),  31 },
   },
   {
-    { AOM_CDF6( 3673,  5100, 10624, 18431, 23892),  31 },
-    { AOM_CDF6( 1891,  2179,  3130,  6874, 14672),   1 },
-    { AOM_CDF6(17990, 20534, 24659, 28946, 31883),   6 },
+    { AOM_CDF6( 3277,  4780,  9255, 16544, 21853),  31 },
+    { AOM_CDF6( 1655,  2364,  4679, 10029, 18955),  26 },
+    { AOM_CDF6(15549, 19007, 24651, 29173, 31742),   6 },
   },
   {
-    { AOM_CDF6( 6158, 10781, 23027, 30726, 32275),   6 },
-    { AOM_CDF6(  971,  6554, 17719, 26336, 29370),   6 },
-    { AOM_CDF6(15245, 19009, 26979, 32073, 32710),   6 },
+    { AOM_CDF6( 7189, 11732, 21773, 29775, 32060),  31 },
+    { AOM_CDF6( 3833,  7634, 15540, 24684, 30675),  31 },
+    { AOM_CDF6(26250, 28453, 31497, 32596, 32732),  32 },
   },
 };
 
 static const aom_cdf_prob av1_default_eob_multi64_cdfs[4][3][CDF_SIZE(7)] = {
   {
-    { AOM_CDF7( 2312,  3086,  5417,  9567, 15311, 24073),  32 },
-    { AOM_CDF7( 2903,  3159,  4368,  6450,  9722, 16175),   6 },
-    { AOM_CDF7(12771, 15568, 20205, 24878, 28919, 31473),   6 },
+    { AOM_CDF7( 1848,  2357,  4392,  7629, 13328, 21530),  32 },
+    { AOM_CDF7( 1476,  1703,  2435,  4245,  7520, 14818),   6 },
+    { AOM_CDF7(13125, 16136, 21482, 26341, 29681, 31034),  31 },
   },
   {
-    { AOM_CDF7( 2545,  3542,  6922, 12367, 19691, 28790),  31 },
-    { AOM_CDF7( 1766,  2030,  2788,  4708,  8375, 15041),   6 },
-    { AOM_CDF7(14737, 17201, 21763, 26035, 29703, 31643),  31 },
+    { AOM_CDF7(  939,  1381,  3142,  6536, 13617, 21799),  31 },
+    { AOM_CDF7( 1338,  1662,  2777,  5268,  9184, 15736),  31 },
+    { AOM_CDF7( 9398, 11810, 17045, 22537, 27448, 30795),  31 },
   },
   {
-    { AOM_CDF7( 4643,  5964, 11690, 19867, 26822, 31090),  31 },
-    { AOM_CDF7( 8768,  9181, 12405, 15406, 19647, 24054),   6 },
-    { AOM_CDF7(19321, 21411, 25537, 29191, 31652, 32512),   1 },
+    { AOM_CDF7( 2024,  3239,  6969, 13073, 21617, 27643),  31 },
+    { AOM_CDF7( 1514,  1937,  3810,  7727, 13471, 23183),  31 },
+    { AOM_CDF7(14959, 18244, 24321, 29177, 31773, 32497),   1 },
   },
   {
-    { AOM_CDF7( 4124,  5987, 14977, 24424, 30701, 32566),  31 },
-    { AOM_CDF7( 5308, 10204, 17063, 18202, 26370, 31387),   6 },
-    { AOM_CDF7(20020, 22282, 26222, 30289, 32236, 32724),   1 },
+    { AOM_CDF7( 3765,  6333, 13340, 20831, 28830, 32289),  31 },
+    { AOM_CDF7( 5045,  7407, 13926, 20909, 27015, 31664),  31 },
+    { AOM_CDF7(24202, 26714, 30623, 32371, 32728, 32732),   6 },
   },
 };
 
 static const aom_cdf_prob av1_default_eob_multi128_cdfs[4][3][CDF_SIZE(8)] = {
   {
-    { AOM_CDF8(  675,  1560,  4377,  8055, 14975, 24348, 28727),  32 },
-    { AOM_CDF8( 2262,  2942,  4898,  7298, 10228, 15787, 24237),   7 },
-    { AOM_CDF8( 6359, 10372, 16286, 21782, 27344, 30522, 32240),  31 },
+    { AOM_CDF8(  336,   988,  2984,  5382,  9800, 16995, 24488),  32 },
+    { AOM_CDF8( 1506,  2078,  2996,  4361,  7027, 12117, 21037),   6 },
+    { AOM_CDF8(10069, 12663, 18436, 24325, 28451, 30559, 31560),  31 },
   },
   {
-    { AOM_CDF8( 2779,  3611,  6534, 11831, 20308, 28993, 30985),  32 },
-    { AOM_CDF8( 2457,  2766,  3953,  5470,  9201, 15498, 22575),  32 },
-    { AOM_CDF8(20578, 22601, 25934, 28568, 30706, 31903, 32453),  31 },
+    { AOM_CDF8(  654,  1068,  2257,  5580, 12362, 21455, 26067),  32 },
+    { AOM_CDF8( 1852,  2243,  3554,  5549,  9085, 14604, 21559),  32 },
+    { AOM_CDF8( 9713, 12146, 17484, 22818, 27372, 30388, 31811),  31 },
   },
   {
-    { AOM_CDF8( 5283,  6577, 12169, 19858, 27333, 31436, 32166),   6 },
-    { AOM_CDF8(14043, 14677, 18201, 20658, 23277, 25799, 27975),  31 },
-    { AOM_CDF8(21897, 23704, 28159, 30728, 32050, 32571, 32716),   6 },
+    { AOM_CDF8( 1672,  2600,  5666, 11986, 21596, 28733, 30851),  31 },
+    { AOM_CDF8( 2101,  2605,  4469,  8056, 13125, 19491, 26379),  31 },
+    { AOM_CDF8(15041, 18279, 24430, 28935, 31545, 32439, 32672),   6 },
   },
   {
-    { AOM_CDF8( 5794,  8143, 15765, 23935, 29693, 32195, 32579),   6 },
-    { AOM_CDF8(12643, 13738, 16846, 22874, 27070, 29923, 31549),  31 },
-    { AOM_CDF8(23530, 25291, 28975, 31125, 32354, 32719, 32723),   1 },
+    { AOM_CDF8( 4122,  6840, 13278, 20906, 28131, 31450, 32305),  31 },
+    { AOM_CDF8( 4575,  6063, 10938, 17191, 23126, 27885, 31584),  31 },
+    { AOM_CDF8(23490, 25861, 30005, 32096, 32701, 32720, 32724),   1 },
   },
 };
 
 static const aom_cdf_prob av1_default_eob_multi256_cdfs[4][3][CDF_SIZE(8)] = {
   {
-    { AOM_CDF8( 1013,  3504,  7711, 11650, 18587, 26840, 29057),  32 },
-    { AOM_CDF8( 4699,  6267, 10251, 12882, 16076, 19124, 23200),  32 },
-    { AOM_CDF8( 6625, 11253, 16681, 20805, 25638, 29545, 31656),  32 },
+    { AOM_CDF8(  321,  2376,  5427,  7836, 12726, 18552, 21084),  32 },
+    { AOM_CDF8( 1954,  2587,  3867,  5133,  7560, 10574, 14742),  37 },
+    { AOM_CDF8( 7984, 10878, 15991, 20185, 25357, 29358, 31262),  32 },
   },
   {
-    { AOM_CDF8( 3077,  4254,  7792, 13858, 22338, 29819, 30981),  32 },
-    { AOM_CDF8( 4769,  5305,  7159, 10505, 15051, 19628, 25304),  32 },
-    { AOM_CDF8(20255, 22949, 26558, 29185, 31238, 32165, 32576),  31 },
+    { AOM_CDF8(  790,  1184,  2218,  5022, 11432, 20289, 23689),  57 },
+    { AOM_CDF8( 2998,  3363,  4528,  6371,  9250, 13525, 18730),  32 },
+    { AOM_CDF8( 9611, 12008, 17284, 22532, 26744, 29711, 31730),  31 },
   },
   {
-    { AOM_CDF8( 5175,  7312, 13185, 20927, 28256, 31787, 32350),   6 },
-    { AOM_CDF8(15994, 17173, 23591, 26244, 28447, 29986, 31213),   7 },
-    { AOM_CDF8(23527, 25618, 29588, 31566, 32407, 32626, 32712),   6 },
+    { AOM_CDF8( 1556,  2520,  5142, 10585, 19507, 28407, 30571),  32 },
+    { AOM_CDF8( 3608,  4081,  5802,  8998, 13007, 18326, 23738),  32 },
+    { AOM_CDF8(14007, 17061, 22822, 27233, 30196, 31899, 32583),   6 },
   },
   {
-    { AOM_CDF8( 6750,  9012, 17064, 25137, 30587, 32292, 32459),   6 },
-    { AOM_CDF8(24628, 25525, 28220, 29470, 30917, 31924, 32370),   7 },
-    { AOM_CDF8(28744, 29723, 31544, 32323, 32566, 32716, 32720),   1 },
+    { AOM_CDF8( 3574,  5683, 11604, 19611, 27344, 30852, 31552),  31 },
+    { AOM_CDF8( 7197,  7949, 12414, 18002, 23115, 27424, 30391),  32 },
+    { AOM_CDF8(23383, 25747, 29846, 31947, 32613, 32720, 32724),   6 },
   },
 };
 
 static const aom_cdf_prob av1_default_eob_multi512_cdfs[4][3][CDF_SIZE(8)] = {
   {
-    { AOM_CDF8(  596,  5892, 14641, 18338, 23518, 29816, 30635),  32 },
-    { AOM_CDF8(10094, 11179, 14282, 17672, 20354, 22267, 24602),  32 },
-    { AOM_CDF8( 9160, 13639, 21053, 24332, 27999, 29843, 31619),  32 },
+    { AOM_CDF8(  139,  5954, 13032, 16244, 20068, 24954, 25897),  32 },
+    { AOM_CDF8( 3412,  3896,  5734,  7524, 10117, 13773, 16441),  62 },
+    { AOM_CDF8(12810, 16127, 22415, 25016, 27768, 29850, 31372),  32 },
   },
   {
-    { AOM_CDF8( 4283,  6557, 10372, 16035, 23492, 31107, 31558),  32 },
-    { AOM_CDF8(11790, 12971, 16095, 20231, 23447, 27017, 29113),  32 },
-    { AOM_CDF8(19614, 22359, 26048, 28387, 31182, 32040, 32392),  32 },
+    { AOM_CDF8( 1311,  2019,  3578,  6876, 13781, 23541, 24922),  62 },
+    { AOM_CDF8( 5415,  5926,  7647, 10113, 13081, 17084, 20509),  57 },
+    { AOM_CDF8( 9906, 12482, 17574, 22657, 27655, 30234, 31821),  32 },
   },
   {
-    { AOM_CDF8( 5403,  7657, 12353, 19623, 27398, 32240, 32379),  32 },
-    { AOM_CDF8(13456, 14859, 19117, 22904, 25730, 27624, 30025),   7 },
-    { AOM_CDF8(20940, 23205, 26669, 29374, 31685, 32529, 32708),   7 },
+    { AOM_CDF8( 1654,  2720,  5317, 10565, 19306, 29790, 30875),  32 },
+    { AOM_CDF8( 7237,  7980, 10164, 13730, 18015, 23652, 27137),  32 },
+    { AOM_CDF8(14503, 17149, 22592, 27035, 30013, 31699, 32526),   7 },
   },
   {
-    { AOM_CDF8( 8387, 10735, 16407, 24315, 30670, 32414, 32478),   6 },
-    { AOM_CDF8(22321, 24003, 28174, 30937, 31630, 32111, 32344),   2 },
-    { AOM_CDF8(25107, 26576, 29436, 31339, 32108, 32710, 32714),   7 },
+    { AOM_CDF8( 3753,  5634, 10147, 17539, 26473, 32201, 32398),   6 },
+    { AOM_CDF8(11196, 12269, 16359, 22348, 27230, 30729, 31805),  32 },
+    { AOM_CDF8(22240, 24551, 29042, 31545, 32498, 32720, 32724),   7 },
   },
 };
 
 static const aom_cdf_prob av1_default_eob_multi1024_cdfs[4][3][CDF_SIZE(8)] = {
   {
-    { AOM_CDF8(11880, 13094, 17868, 20898, 24225, 28433, 29482),  57 },
-    { AOM_CDF8( 9825, 10303, 12215, 14392, 17207, 19332, 21243),  57 },
-    { AOM_CDF8(11131, 14952, 27154, 28348, 29266, 30215, 30713),  57 },
+    { AOM_CDF8(  576,  1953,  8086, 14995, 20006, 24682, 25870),  62 },
+    { AOM_CDF8( 2747,  3019,  3935,  4876,  6051,  8588, 10135),  57 },
+    { AOM_CDF8(11873, 15379, 25835, 27918, 29093, 30164, 30782),  32 },
   },
   {
-    { AOM_CDF8( 2486,  5747, 10888, 15748, 22661, 29024, 29963),  32 },
-    { AOM_CDF8(12967, 14212, 17927, 21505, 25428, 28451, 30544),  32 },
-    { AOM_CDF8(24528, 26435, 30202, 31055, 31966, 32395, 32639),  32 },
+    { AOM_CDF8(  634,  1777,  3873,  6293, 12653, 23825, 24712),  57 },
+    { AOM_CDF8( 4894,  5819,  8219, 11022, 14406, 18919, 21479),  57 },
+    { AOM_CDF8( 9216, 12549, 17630, 21723, 25862, 28760, 30440),  37 },
   },
   {
-    { AOM_CDF8( 5538,  7689, 12560, 19337, 26505, 31887, 32111),  32 },
-    { AOM_CDF8(15280, 16484, 20477, 24536, 28156, 30431, 31766),  32 },
-    { AOM_CDF8(26347, 28435, 30741, 31994, 32563, 32708, 32712),  32 },
+    { AOM_CDF8( 2101,  3304,  6486, 12539, 21781, 30341, 30738),  32 },
+    { AOM_CDF8(11349, 12231, 14967, 18532, 22406, 26663, 28302),  57 },
+    { AOM_CDF8(15081, 17873, 23055, 27251, 30053, 31491, 32305),  32 },
   },
   {
-    { AOM_CDF8( 7658, 11411, 18649, 25489, 30200, 32512, 32585),   6 },
-    { AOM_CDF8(14042, 16903, 23512, 30033, 32254, 32631, 32704),   7 },
-    { AOM_CDF8(27599, 29349, 31919, 32512, 32712, 32716, 32720),   7 },
+    { AOM_CDF8( 5838,  8921, 14454, 21162, 27888, 32275, 32424),  31 },
+    { AOM_CDF8(15377, 16920, 20643, 25175, 28586, 31294, 32008),  32 },
+    { AOM_CDF8(23067, 25626, 29608, 31655, 32465, 32687, 32716),   7 },
   },
 };
 
 static const aom_cdf_prob av1_default_eob_extra_cdfs[4][CDF_SIZE(2)] = {
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
+  { AOM_CDF2(16391),   0 },
+  { AOM_CDF2(18326),   0 },
+  { AOM_CDF2(19673),  78 },
+  { AOM_CDF2(20364),   3 },
 };
 
 static const aom_cdf_prob av1_default_coeff_base_eob_multi_cdfs[4][5][4][CDF_SIZE(3)] = {
@@ -194,31 +194,31 @@
       { AOM_CDF3(10923, 21845),   0 },
       { AOM_CDF3(10923, 21845),   0 },
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(27624, 30670),  75 },
+      { AOM_CDF3(25475, 29789),  75 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(31729, 32675),  25 },
-      { AOM_CDF3(31286, 32498),  75 },
-      { AOM_CDF3(31494, 32509),  93 },
+      { AOM_CDF3(32132, 32609),  50 },
+      { AOM_CDF3(32294, 32701),  75 },
+      { AOM_CDF3(31618, 32500),  93 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32677, 32756),  99 },
-      { AOM_CDF3(32737, 32756),  79 },
-      { AOM_CDF3(32697, 32748), 123 },
+      { AOM_CDF3(32658, 32751),  78 },
+      { AOM_CDF3(32701, 32753),  93 },
+      { AOM_CDF3(32675, 32745),  93 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32708, 32746), 124 },
-      { AOM_CDF3(32257, 32474),  75 },
-      { AOM_CDF3(32010, 32492), 110 },
+      { AOM_CDF3(32658, 32719),  65 },
+      { AOM_CDF3(32658, 32744),  67 },
+      { AOM_CDF3(32647, 32756),  33 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32750, 32756),   0 },
-      { AOM_CDF3(32725, 32746),   0 },
-      { AOM_CDF3(32389, 32710),   0 },
+      { AOM_CDF3(32538, 32711),   0 },
+      { AOM_CDF3(32138, 32453),   0 },
+      { AOM_CDF3(32356, 32562),  50 },
     },
   },
   {
@@ -226,31 +226,31 @@
       { AOM_CDF3(10923, 21845),   0 },
       { AOM_CDF3(10923, 21845),   0 },
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(29143, 31212),   3 },
+      { AOM_CDF3(26028, 30728),   3 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(31856, 32561),  97 },
-      { AOM_CDF3(32584, 32749), 118 },
-      { AOM_CDF3(32393, 32666), 103 },
+      { AOM_CDF3(31077, 32105),  85 },
+      { AOM_CDF3(31889, 32651),  93 },
+      { AOM_CDF3(31276, 32538),  93 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32684, 32756), 123 },
-      { AOM_CDF3(32739, 32756), 123 },
-      { AOM_CDF3(32705, 32754), 118 },
+      { AOM_CDF3(32624, 32752),  93 },
+      { AOM_CDF3(32688, 32756),  93 },
+      { AOM_CDF3(32695, 32756),  93 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32731, 32756), 119 },
-      { AOM_CDF3(32176, 32659),   7 },
-      { AOM_CDF3(31644, 32588),   1 },
+      { AOM_CDF3(32677, 32743),  68 },
+      { AOM_CDF3(32051, 32739),   7 },
+      { AOM_CDF3(32291, 32748),  32 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32746, 32756), 123 },
-      { AOM_CDF3(32723, 32756),   0 },
-      { AOM_CDF3(23115, 31638),  62 },
+      { AOM_CDF3(32710, 32756),  78 },
+      { AOM_CDF3(32700, 32756),  13 },
+      { AOM_CDF3(24989, 32282),  62 },
     },
   },
   {
@@ -258,31 +258,31 @@
       { AOM_CDF3(10923, 21845),   0 },
       { AOM_CDF3(10923, 21845),   0 },
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(30287, 32090),  93 },
+      { AOM_CDF3(28958, 32194),  93 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32023, 32695), 100 },
-      { AOM_CDF3(32636, 32754), 123 },
-      { AOM_CDF3(32587, 32718), 118 },
+      { AOM_CDF3(32132, 32735),  25 },
+      { AOM_CDF3(32555, 32745),  93 },
+      { AOM_CDF3(32458, 32729),  93 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32696, 32756), 123 },
-      { AOM_CDF3(32747, 32756), 123 },
-      { AOM_CDF3(32720, 32756), 123 },
+      { AOM_CDF3(32617, 32754),  93 },
+      { AOM_CDF3(32699, 32756),  93 },
+      { AOM_CDF3(32695, 32756),  93 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32742, 32756), 123 },
-      { AOM_CDF3(32550, 32740),   1 },
-      { AOM_CDF3(32305, 32733),  79 },
+      { AOM_CDF3(32684, 32756),  93 },
+      { AOM_CDF3(32552, 32756),  10 },
+      { AOM_CDF3(32589, 32756),  75 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32744, 32756), 119 },
-      { AOM_CDF3(32738, 32756),  75 },
-      { AOM_CDF3(30344, 32714),  51 },
+      { AOM_CDF3(32687, 32756),  93 },
+      { AOM_CDF3(32716, 32756),  91 },
+      { AOM_CDF3(31504, 32715),  56 },
     },
   },
   {
@@ -290,31 +290,31 @@
       { AOM_CDF3(10923, 21845),   0 },
       { AOM_CDF3(10923, 21845),   0 },
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(31110, 32415),  28 },
+      { AOM_CDF3(31358, 32747),  18 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32192, 32743),  50 },
-      { AOM_CDF3(32709, 32756), 124 },
-      { AOM_CDF3(32430, 32717),  24 },
+      { AOM_CDF3(32389, 32626),  75 },
+      { AOM_CDF3(32642, 32756),  93 },
+      { AOM_CDF3(32629, 32756),  18 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32721, 32756), 124 },
-      { AOM_CDF3(32754, 32758),  99 },
-      { AOM_CDF3(32712, 32756), 118 },
+      { AOM_CDF3(32686, 32756),  93 },
+      { AOM_CDF3(32726, 32756),  93 },
+      { AOM_CDF3(32724, 32756),  15 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32747, 32756), 118 },
-      { AOM_CDF3(32136, 32673),   9 },
-      { AOM_CDF3(32008, 32746),  22 },
+      { AOM_CDF3(32700, 32756),  93 },
+      { AOM_CDF3(32577, 32756),  40 },
+      { AOM_CDF3(32626, 32753),  88 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
-      { AOM_CDF3(32753, 32757), 124 },
-      { AOM_CDF3(32493, 32756),   0 },
-      { AOM_CDF3(31755, 32756),  25 },
+      { AOM_CDF3(32708, 32756),  93 },
+      { AOM_CDF3(32603, 32749),  91 },
+      { AOM_CDF3(32644, 32756),  42 },
     },
   },
 };
@@ -322,155 +322,155 @@
 static const aom_cdf_prob av1_default_coeff_base_eob_multi_uv_cdfs[4][4][CDF_SIZE(3)] = {
   {
     { AOM_CDF3(10923, 21845),   0 },
-    { AOM_CDF3(31158, 32513), 118 },
-    { AOM_CDF3(32171, 32661), 118 },
-    { AOM_CDF3(32155, 32640),  93 },
+    { AOM_CDF3(31214, 32437),  93 },
+    { AOM_CDF3(31888, 32447),  78 },
+    { AOM_CDF3(30612, 32073),  93 },
   },
   {
     { AOM_CDF3(10923, 21845),   0 },
-    { AOM_CDF3(32236, 32675), 118 },
-    { AOM_CDF3(32459, 32721), 123 },
-    { AOM_CDF3(31994, 32604),  93 },
+    { AOM_CDF3(31595, 32587),  93 },
+    { AOM_CDF3(32266, 32710),  93 },
+    { AOM_CDF3(32287, 32698),  93 },
   },
   {
     { AOM_CDF3(10923, 21845),   0 },
-    { AOM_CDF3(31906, 32644), 118 },
-    { AOM_CDF3(32421, 32725), 123 },
-    { AOM_CDF3(32277, 32670), 118 },
+    { AOM_CDF3(32086, 32691),  93 },
+    { AOM_CDF3(32538, 32743),  93 },
+    { AOM_CDF3(32512, 32730),  93 },
   },
   {
     { AOM_CDF3(10923, 21845),   0 },
-    { AOM_CDF3(32163, 32714), 118 },
-    { AOM_CDF3(32565, 32747),  75 },
-    { AOM_CDF3(32568, 32742),  24 },
+    { AOM_CDF3(31987, 32697),  93 },
+    { AOM_CDF3(32662, 32756),  90 },
+    { AOM_CDF3(32487, 32698),  60 },
   },
 };
 
 static const aom_cdf_prob av1_default_coeff_base_lf_eob_multi_cdfs[4][5][4][CDF_SIZE(5)] = {
   {
     {
-      { AOM_CDF5(25706, 30492, 31324, 31818),  31 },
-      { AOM_CDF5(30435, 32242, 32513, 32588),   6 },
-      { AOM_CDF5(30457, 32136, 32402, 32484),   6 },
-      { AOM_CDF5(31003, 32505, 32676, 32714),  93 },
+      { AOM_CDF5(27486, 31140, 31779, 32064),   7 },
+      { AOM_CDF5(28263, 31142, 31813, 32057),   6 },
+      { AOM_CDF5(27578, 30405, 31202, 31448),   6 },
+      { AOM_CDF5(29800, 32145, 32589, 32665),  93 },
     },
     {
-      { AOM_CDF5(26971, 31768, 32295, 32463),  32 },
-      { AOM_CDF5(31374, 32459, 32638, 32681),   0 },
-      { AOM_CDF5(31787, 32529, 32654, 32694),  75 },
-      { AOM_CDF5(31845, 32521, 32709, 32740), 115 },
+      { AOM_CDF5(27197, 31209, 31698, 31944),  32 },
+      { AOM_CDF5(30415, 31987, 32302, 32387),   0 },
+      { AOM_CDF5(30766, 32160, 32461, 32564),  75 },
+      { AOM_CDF5(31446, 32510, 32712, 32740),  90 },
     },
     {
-      { AOM_CDF5(23861, 30832, 31714, 32106),  62 },
-      { AOM_CDF5(31998, 32582, 32684, 32714),   0 },
-      { AOM_CDF5(32595, 32690, 32743, 32747),  70 },
-      { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
+      { AOM_CDF5( 9881, 28329, 30354, 31217),  62 },
+      { AOM_CDF5(30815, 32135, 32360, 32446),   5 },
+      { AOM_CDF5(31896, 32058, 32423, 32525),  37 },
+      { AOM_CDF5(27097, 28987, 31508, 32138),  50 },
     },
     {
-      { AOM_CDF5( 2526, 25431, 28941, 29883),  62 },
-      { AOM_CDF5(32001, 32609, 32739, 32743),  78 },
+      { AOM_CDF5(   76,  3661, 13759, 21509),  62 },
+      { AOM_CDF5(31910, 32583, 32688, 32740),  93 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
     },
     {
-      { AOM_CDF5(  380,  9474, 22790, 27895),  50 },
-      { AOM_CDF5(31118, 31976, 32602, 32703), 110 },
+      { AOM_CDF5(  298,   596,   894,  1192),  50 },
+      { AOM_CDF5(29008, 30611, 32490, 32683),   3 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
     },
   },
   {
     {
-      { AOM_CDF5(27737, 31996, 32445, 32576),  91 },
-      { AOM_CDF5(30369, 32297, 32588, 32661),   0 },
-      { AOM_CDF5(30243, 32316, 32564, 32629),   0 },
-      { AOM_CDF5(30663, 32404, 32673, 32728),  75 },
+      { AOM_CDF5(28595, 31926, 32420, 32582),  91 },
+      { AOM_CDF5(28506, 31820, 32509, 32686),   0 },
+      { AOM_CDF5(28680, 31966, 32503, 32626),   0 },
+      { AOM_CDF5(27591, 32110, 32578, 32712),  75 },
     },
     {
-      { AOM_CDF5(27556, 32109, 32520, 32621),   1 },
-      { AOM_CDF5(32081, 32624, 32700, 32728),  75 },
-      { AOM_CDF5(32088, 32612, 32712, 32735),  75 },
-      { AOM_CDF5(32040, 32619, 32735, 32740),  78 },
+      { AOM_CDF5(28550, 32010, 32465, 32593),   1 },
+      { AOM_CDF5(31254, 32502, 32660, 32713),  75 },
+      { AOM_CDF5(31600, 32549, 32688, 32735),  75 },
+      { AOM_CDF5(31747, 32600, 32712, 32740),  78 },
     },
     {
-      { AOM_CDF5(26819, 31724, 32283, 32522),   7 },
-      { AOM_CDF5(32282, 32649, 32726, 32740),   0 },
-      { AOM_CDF5(32658, 32742, 32746, 32750),  45 },
-      { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
+      { AOM_CDF5(27239, 31085, 31883, 32247),   7 },
+      { AOM_CDF5(31836, 32524, 32640, 32686),   0 },
+      { AOM_CDF5(32293, 32547, 32627, 32711),  43 },
+      { AOM_CDF5(24966, 28087, 29127, 31988),  50 },
     },
     {
-      { AOM_CDF5(21304, 30635, 31780, 32198),  37 },
-      { AOM_CDF5(32186, 32676, 32744, 32748), 115 },
+      { AOM_CDF5(22871, 30729, 31682, 32000),  37 },
+      { AOM_CDF5(32054, 32674, 32735, 32740),  90 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
     },
     {
-      { AOM_CDF5(12126, 24303, 28452, 30526),  62 },
-      { AOM_CDF5(31647, 32479, 32695, 32740),   1 },
+      { AOM_CDF5( 7975, 22586, 27023, 29960),  62 },
+      { AOM_CDF5(31368, 32346, 32628, 32738),   6 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
     },
   },
   {
     {
-      { AOM_CDF5(28639, 32047, 32463, 32605),  76 },
-      { AOM_CDF5(29406, 32125, 32576, 32668),  75 },
-      { AOM_CDF5(29707, 32214, 32602, 32664),  75 },
-      { AOM_CDF5(28971, 32253, 32613, 32713),  75 },
+      { AOM_CDF5(29573, 32066, 32477, 32625),  76 },
+      { AOM_CDF5(28827, 32168, 32643, 32735),  90 },
+      { AOM_CDF5(29362, 32299, 32653, 32722),  75 },
+      { AOM_CDF5(29765, 32457, 32711, 32740),  90 },
     },
     {
-      { AOM_CDF5(28326, 32215, 32550, 32645),   0 },
-      { AOM_CDF5(32183, 32660, 32727, 32740),  75 },
-      { AOM_CDF5(32136, 32641, 32726, 32740), 100 },
-      { AOM_CDF5(31896, 32611, 32736, 32740), 104 },
+      { AOM_CDF5(29324, 32291, 32617, 32714),   0 },
+      { AOM_CDF5(31938, 32652, 32728, 32740),  75 },
+      { AOM_CDF5(31949, 32673, 32738, 32742),  75 },
+      { AOM_CDF5(31802, 32666, 32744, 32748),  78 },
     },
     {
-      { AOM_CDF5(28120, 31988, 32441, 32602),   6 },
-      { AOM_CDF5(32388, 32686, 32743, 32747),  75 },
-      { AOM_CDF5(32648, 32741, 32745, 32749), 123 },
-      { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
+      { AOM_CDF5(28567, 31870, 32438, 32629),   6 },
+      { AOM_CDF5(32100, 32663, 32732, 32740),  75 },
+      { AOM_CDF5(32648, 32724, 32744, 32748),  83 },
+      { AOM_CDF5(25565, 32000, 32473, 32709),  60 },
     },
     {
-      { AOM_CDF5(24374, 30819, 31833, 32231),  32 },
-      { AOM_CDF5(32269, 32694, 32744, 32748),  90 },
+      { AOM_CDF5(26412, 30605, 31764, 32230),  37 },
+      { AOM_CDF5(32167, 32698, 32744, 32748),  90 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
     },
     {
-      { AOM_CDF5(22957, 29321, 31125, 31846),  62 },
-      { AOM_CDF5(31994, 32641, 32740, 32744),  76 },
+      { AOM_CDF5(24457, 29221, 30907, 31726),  62 },
+      { AOM_CDF5(32052, 32690, 32737, 32741),  90 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
     },
   },
   {
     {
-      { AOM_CDF5(29534, 32281, 32481, 32541),   5 },
-      { AOM_CDF5(30069, 32534, 32711, 32740),   1 },
-      { AOM_CDF5(29896, 32098, 32507, 32629),   1 },
-      { AOM_CDF5(30824, 32659, 32744, 32748),  36 },
+      { AOM_CDF5(30609, 32413, 32637, 32716),   5 },
+      { AOM_CDF5(30333, 32610, 32744, 32748),   1 },
+      { AOM_CDF5(31067, 32497, 32676, 32711),   1 },
+      { AOM_CDF5(32062, 32748, 32752, 32756),  36 },
     },
     {
-      { AOM_CDF5(29970, 32442, 32654, 32712),   1 },
-      { AOM_CDF5(32327, 32690, 32744, 32748),  75 },
-      { AOM_CDF5(31949, 32625, 32744, 32748),  75 },
-      { AOM_CDF5(32125, 32716, 32744, 32748),  33 },
+      { AOM_CDF5(31289, 32570, 32714, 32740),   1 },
+      { AOM_CDF5(32248, 32709, 32744, 32748),  75 },
+      { AOM_CDF5(32234, 32719, 32744, 32748),  75 },
+      { AOM_CDF5(32449, 32740, 32744, 32748),   3 },
     },
     {
-      { AOM_CDF5(30437, 32423, 32627, 32709),   6 },
-      { AOM_CDF5(32458, 32699, 32744, 32748),  90 },
-      { AOM_CDF5(32629, 32748, 32752, 32756), 110 },
-      { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
+      { AOM_CDF5(31348, 32506, 32654, 32724),   6 },
+      { AOM_CDF5(32301, 32703, 32744, 32748),  90 },
+      { AOM_CDF5(32692, 32739, 32744, 32748),   7 },
+      { AOM_CDF5(20480, 26624, 28672, 30720),  50 },
     },
     {
-      { AOM_CDF5(29506, 32156, 32559, 32656),   7 },
-      { AOM_CDF5(32305, 32712, 32744, 32748),  90 },
+      { AOM_CDF5(30132, 32214, 32554, 32667),   7 },
+      { AOM_CDF5(32297, 32711, 32744, 32748),  90 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
     },
     {
-      { AOM_CDF5(28059, 31831, 32419, 32581),  37 },
-      { AOM_CDF5(32204, 32695, 32744, 32748), 115 },
+      { AOM_CDF5(28223, 31648, 32311, 32527),  37 },
+      { AOM_CDF5(32184, 32695, 32744, 32748),  90 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
       { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
     },
@@ -479,27 +479,27 @@
 
 static const aom_cdf_prob av1_default_coeff_base_lf_eob_multi_uv_cdfs[4][4][CDF_SIZE(5)] = {
   {
-    { AOM_CDF5(27581, 31285, 32137, 32389),  75 },
-    { AOM_CDF5(32091, 32608, 32696, 32731), 109 },
-    { AOM_CDF5(31701, 32617, 32710, 32728),   0 },
+    { AOM_CDF5(28950, 31443, 32009, 32257),  75 },
+    { AOM_CDF5(29916, 31919, 32224, 32441),   6 },
+    { AOM_CDF5(28902, 30805, 31579, 31816),   2 },
     { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
   },
   {
-    { AOM_CDF5(29919, 32176, 32482, 32582),  75 },
-    { AOM_CDF5(31710, 32521, 32675, 32720),  95 },
-    { AOM_CDF5(31097, 32475, 32679, 32721),  20 },
+    { AOM_CDF5(29843, 32183, 32562, 32675),  75 },
+    { AOM_CDF5(29975, 31731, 32100, 32264),  12 },
+    { AOM_CDF5(30096, 31949, 32460, 32611),  27 },
     { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
   },
   {
-    { AOM_CDF5(29814, 32132, 32501, 32588),  75 },
-    { AOM_CDF5(31625, 32617, 32733, 32740),  78 },
-    { AOM_CDF5(30527, 32340, 32673, 32740),  24 },
+    { AOM_CDF5(30964, 32463, 32673, 32733),  75 },
+    { AOM_CDF5(31731, 32623, 32730, 32740),   1 },
+    { AOM_CDF5(30879, 32453, 32716, 32740),  16 },
     { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
   },
   {
-    { AOM_CDF5(31131, 32506, 32661, 32703), 100 },
-    { AOM_CDF5(31161, 32411, 32589, 32679), 100 },
-    { AOM_CDF5(28744, 31043, 31618, 32193),   0 },
+    { AOM_CDF5(31345, 32511, 32676, 32725),  76 },
+    { AOM_CDF5(31940, 32413, 32531, 32650),  50 },
+    { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
     { AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
   },
 };
@@ -507,19 +507,19 @@
 static const aom_cdf_prob av1_default_coeff_base_bob_multi_cdfs[4][5][3][CDF_SIZE(3)] = {
   {
     {
-      { AOM_CDF3( 9327, 16633),  15 },
-      { AOM_CDF3(12473, 20430),  76 },
-      { AOM_CDF3(11006, 19355),  15 },
+      { AOM_CDF3( 9917, 17060),  90 },
+      { AOM_CDF3(13841, 21928),  91 },
+      { AOM_CDF3(11228, 19107),  90 },
     },
     {
-      { AOM_CDF3(10104, 16597),   0 },
-      { AOM_CDF3(13122, 19983),  16 },
-      { AOM_CDF3(13695, 21298),   1 },
+      { AOM_CDF3(11194, 18097),  15 },
+      { AOM_CDF3(13829, 21552),  91 },
+      { AOM_CDF3(15625, 22723),   1 },
     },
     {
-      { AOM_CDF3( 8776, 13455),   1 },
-      { AOM_CDF3(10846, 15705),   3 },
-      { AOM_CDF3(11467, 17659),   1 },
+      { AOM_CDF3(10164, 15059),   1 },
+      { AOM_CDF3(11087, 15990),   0 },
+      { AOM_CDF3(12184, 18484),  31 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
@@ -534,19 +534,19 @@
   },
   {
     {
-      { AOM_CDF3(17292, 23855),  75 },
-      { AOM_CDF3(19621, 25643),  90 },
-      { AOM_CDF3(17055, 25342),   0 },
+      { AOM_CDF3(16673, 23002),  75 },
+      { AOM_CDF3(19890, 25933),  90 },
+      { AOM_CDF3(18355, 25595),  75 },
     },
     {
-      { AOM_CDF3(19366, 26667),   0 },
-      { AOM_CDF3(21918, 28378),   0 },
-      { AOM_CDF3(21806, 28925),   0 },
+      { AOM_CDF3(19619, 25865),   0 },
+      { AOM_CDF3(22421, 27836),   0 },
+      { AOM_CDF3(22018, 27887),   0 },
     },
     {
-      { AOM_CDF3(23142, 29184),   6 },
-      { AOM_CDF3(25565, 30488),   0 },
-      { AOM_CDF3(26465, 30728),   1 },
+      { AOM_CDF3(22395, 27670),  31 },
+      { AOM_CDF3(24275, 28656),  31 },
+      { AOM_CDF3(22595, 28026),   1 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
@@ -561,19 +561,19 @@
   },
   {
     {
-      { AOM_CDF3(17235, 25080),  90 },
-      { AOM_CDF3(18542, 26200),  90 },
-      { AOM_CDF3(16850, 26452),  75 },
+      { AOM_CDF3(17507, 24673),  90 },
+      { AOM_CDF3(19003, 25281),  90 },
+      { AOM_CDF3(18718, 27145),   0 },
     },
     {
-      { AOM_CDF3(20758, 27807),  90 },
-      { AOM_CDF3(22683, 29011),  90 },
-      { AOM_CDF3(22813, 29702),  75 },
+      { AOM_CDF3(22679, 29259),  15 },
+      { AOM_CDF3(24245, 30291),   0 },
+      { AOM_CDF3(25590, 31051),   0 },
     },
     {
-      { AOM_CDF3(24899, 30056),  75 },
-      { AOM_CDF3(27287, 31179),  75 },
-      { AOM_CDF3(28586, 31683),  75 },
+      { AOM_CDF3(26844, 31178),   6 },
+      { AOM_CDF3(28524, 31813),   1 },
+      { AOM_CDF3(29430, 32097),   1 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
@@ -588,19 +588,19 @@
   },
   {
     {
-      { AOM_CDF3(18396, 31174),  30 },
-      { AOM_CDF3(19598, 31598),  36 },
-      { AOM_CDF3(18860, 31803),  32 },
+      { AOM_CDF3(20211, 31417),   5 },
+      { AOM_CDF3(22000, 30309),   5 },
+      { AOM_CDF3(24619, 32031),  32 },
     },
     {
-      { AOM_CDF3(26140, 31818),  32 },
-      { AOM_CDF3(26657, 32002),  32 },
-      { AOM_CDF3(26148, 31963),  32 },
+      { AOM_CDF3(25412, 31853),  32 },
+      { AOM_CDF3(26802, 31283),  32 },
+      { AOM_CDF3(29204, 32091),  32 },
     },
     {
-      { AOM_CDF3(29733, 32450),  37 },
-      { AOM_CDF3(30024, 32604),  35 },
-      { AOM_CDF3(30704, 32539),   7 },
+      { AOM_CDF3(30348, 32633),  32 },
+      { AOM_CDF3(31094, 32686),  40 },
+      { AOM_CDF3(31665, 32664),   7 },
     },
     {
       { AOM_CDF3(10923, 21845),   0 },
@@ -619,16 +619,16 @@
   {
     {
       {
-        { AOM_CDF2(30676),   5 },
-        { AOM_CDF2( 1817), 118 },
-        { AOM_CDF2( 5257),   5 },
-        { AOM_CDF2(11824),  31 },
-        { AOM_CDF2(18862),   1 },
-        { AOM_CDF2(31436),   0 },
+        { AOM_CDF2(25759),  31 },
+        { AOM_CDF2( 1099),  93 },
+        { AOM_CDF2( 2762),   5 },
+        { AOM_CDF2( 7944),  26 },
+        { AOM_CDF2(16230),   6 },
+        { AOM_CDF2(29076),  31 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 9076),   1 },
-        { AOM_CDF2(15764),   0 },
-        { AOM_CDF2(24131),   5 },
+        { AOM_CDF2( 8898),   1 },
+        { AOM_CDF2(13655),   1 },
+        { AOM_CDF2(22348),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -641,16 +641,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(31680),  26 },
-        { AOM_CDF2( 2826),  23 },
-        { AOM_CDF2( 7094),   1 },
-        { AOM_CDF2(15183),  31 },
-        { AOM_CDF2(20827),   1 },
-        { AOM_CDF2(31633),  30 },
+        { AOM_CDF2(24799),  56 },
+        { AOM_CDF2( 3162),  75 },
+        { AOM_CDF2( 4813),   0 },
+        { AOM_CDF2(13562),   1 },
+        { AOM_CDF2(17989),  76 },
+        { AOM_CDF2(31799),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 7664),  75 },
-        { AOM_CDF2(15595),   1 },
-        { AOM_CDF2(24849),   1 },
+        { AOM_CDF2( 5170),  75 },
+        { AOM_CDF2(12844),   1 },
+        { AOM_CDF2(22336),   6 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -663,16 +663,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(28327),  57 },
-        { AOM_CDF2( 4727),   1 },
-        { AOM_CDF2( 9135),   7 },
-        { AOM_CDF2(17069),   6 },
-        { AOM_CDF2(19658),  79 },
-        { AOM_CDF2(30914),  80 },
+        { AOM_CDF2(18946),  62 },
+        { AOM_CDF2( 5651),   6 },
+        { AOM_CDF2( 6193),   7 },
+        { AOM_CDF2(15587),   7 },
+        { AOM_CDF2(18312),  91 },
+        { AOM_CDF2(31798),  80 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 3695),   0 },
-        { AOM_CDF2(13683),  26 },
-        { AOM_CDF2(25695),  31 },
+        { AOM_CDF2( 2961),   0 },
+        { AOM_CDF2(11605),  26 },
+        { AOM_CDF2(24657),  31 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -685,16 +685,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(15188),  62 },
-        { AOM_CDF2( 1638),  39 },
-        { AOM_CDF2( 6781),  20 },
-        { AOM_CDF2(10684),  30 },
-        { AOM_CDF2(12336),   0 },
-        { AOM_CDF2(28734),  50 },
+        { AOM_CDF2( 7809),  62 },
+        { AOM_CDF2( 3864),  33 },
+        { AOM_CDF2(14130),  40 },
+        { AOM_CDF2(16018),  32 },
+        { AOM_CDF2(15599),  10 },
+        { AOM_CDF2(28161),  32 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 5301),  31 },
-        { AOM_CDF2(21879),  62 },
-        { AOM_CDF2(28445),  44 },
+        { AOM_CDF2( 1300),  36 },
+        { AOM_CDF2(11703),  57 },
+        { AOM_CDF2(24729),  33 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -707,15 +707,15 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(18113),  62 },
-        { AOM_CDF2( 1731),  50 },
-        { AOM_CDF2(20535),   0 },
-        { AOM_CDF2(29110),  50 },
-        { AOM_CDF2(32670),   0 },
-        { AOM_CDF2(32577),   0 },
+        { AOM_CDF2( 2800),  62 },
+        { AOM_CDF2(  159),  32 },
+        { AOM_CDF2( 1725),  50 },
+        { AOM_CDF2(11138),  50 },
         { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(32319),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(  456),  63 },
+        { AOM_CDF2( 6416),  50 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -731,20 +731,20 @@
     },
     {
       {
-        { AOM_CDF2(32734), 123 },
-        { AOM_CDF2(14456),  75 },
-        { AOM_CDF2(12935),   4 },
-        { AOM_CDF2(24660),  98 },
-        { AOM_CDF2(27344),  38 },
-        { AOM_CDF2(32086), 118 },
+        { AOM_CDF2(32764),   0 },
+        { AOM_CDF2(10751),  16 },
+        { AOM_CDF2(17579),  16 },
+        { AOM_CDF2(24060),  90 },
+        { AOM_CDF2(28085),   5 },
+        { AOM_CDF2(30928),  93 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 2715),   1 },
-        { AOM_CDF2(13236),   1 },
-        { AOM_CDF2(25338),   1 },
+        { AOM_CDF2( 5437),  37 },
+        { AOM_CDF2(17819),  26 },
+        { AOM_CDF2(28074),   8 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(29599),  80 },
+        { AOM_CDF2(30432),  80 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -753,20 +753,20 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32663),   6 },
-        { AOM_CDF2(14570), 123 },
-        { AOM_CDF2(17992), 118 },
-        { AOM_CDF2(22899),  93 },
-        { AOM_CDF2(27330), 100 },
-        { AOM_CDF2(31876), 123 },
+        { AOM_CDF2(32452),  62 },
+        { AOM_CDF2(14328),  93 },
+        { AOM_CDF2(18927),  93 },
+        { AOM_CDF2(22405),  93 },
+        { AOM_CDF2(25460),  93 },
+        { AOM_CDF2(30634),  75 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 3290),   0 },
-        { AOM_CDF2(12288),   1 },
-        { AOM_CDF2(23325),   1 },
+        { AOM_CDF2( 5152),  31 },
+        { AOM_CDF2(15362),  31 },
+        { AOM_CDF2(24814),   6 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(30901),  75 },
+        { AOM_CDF2(31865),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -775,20 +775,20 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32333),  31 },
-        { AOM_CDF2(18623),  78 },
-        { AOM_CDF2(19890),  93 },
-        { AOM_CDF2(23535),  21 },
-        { AOM_CDF2(27371), 121 },
-        { AOM_CDF2(31683),  98 },
+        { AOM_CDF2(31891),  62 },
+        { AOM_CDF2(17014),  93 },
+        { AOM_CDF2(19836),  93 },
+        { AOM_CDF2(20450),   6 },
+        { AOM_CDF2(25131),   1 },
+        { AOM_CDF2(31538),   3 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 5302),   0 },
-        { AOM_CDF2(19163),   2 },
-        { AOM_CDF2(28093),  75 },
+        { AOM_CDF2( 5465),  25 },
+        { AOM_CDF2(17440),  31 },
+        { AOM_CDF2(28788),   1 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(25920),  31 },
+        { AOM_CDF2(29135),  37 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -797,20 +797,20 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(28335),  62 },
-        { AOM_CDF2(19661),  80 },
-        { AOM_CDF2(26985),  50 },
-        { AOM_CDF2(25486),  87 },
-        { AOM_CDF2(30794),  25 },
-        { AOM_CDF2(29588),  10 },
+        { AOM_CDF2(31092),  62 },
+        { AOM_CDF2(11952),  28 },
+        { AOM_CDF2( 1928),   0 },
+        { AOM_CDF2(19906),  12 },
+        { AOM_CDF2(32150),  50 },
+        { AOM_CDF2(31347),  52 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(12429),  50 },
-        { AOM_CDF2(26455),  50 },
-        { AOM_CDF2(29789),  50 },
+        { AOM_CDF2( 9362),  10 },
+        { AOM_CDF2(29127),  50 },
+        { AOM_CDF2(32373),  50 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(19150),  55 },
+        { AOM_CDF2(27387),  60 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -819,8 +819,8 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(20735),  60 },
-        { AOM_CDF2(16384),  50 },
+        { AOM_CDF2(26822),  63 },
+        { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -845,16 +845,16 @@
   {
     {
       {
-        { AOM_CDF2(28488),   0 },
-        { AOM_CDF2( 1447),  78 },
-        { AOM_CDF2( 3421),  76 },
-        { AOM_CDF2( 8913),  31 },
-        { AOM_CDF2(15539),  31 },
-        { AOM_CDF2(28811),   8 },
+        { AOM_CDF2(30296),   5 },
+        { AOM_CDF2( 2871),  75 },
+        { AOM_CDF2( 5650),  76 },
+        { AOM_CDF2(13405),  26 },
+        { AOM_CDF2(19531),   1 },
+        { AOM_CDF2(30186),   5 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 3005),   0 },
-        { AOM_CDF2(14073),   0 },
-        { AOM_CDF2(25450),   0 },
+        { AOM_CDF2( 8778),  31 },
+        { AOM_CDF2(17506),   0 },
+        { AOM_CDF2(26467),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -867,16 +867,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(30864),   0 },
-        { AOM_CDF2( 1270),  93 },
-        { AOM_CDF2( 2930),  75 },
-        { AOM_CDF2( 9276),  31 },
-        { AOM_CDF2(15981),  31 },
-        { AOM_CDF2(29037),   5 },
+        { AOM_CDF2(31530),  30 },
+        { AOM_CDF2( 2361),  78 },
+        { AOM_CDF2( 4301),  75 },
+        { AOM_CDF2(14660),  31 },
+        { AOM_CDF2(19138),   6 },
+        { AOM_CDF2(31475),   5 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 3943),   0 },
-        { AOM_CDF2(11814),   6 },
-        { AOM_CDF2(23331),   0 },
+        { AOM_CDF2( 5031),   0 },
+        { AOM_CDF2(16054),  31 },
+        { AOM_CDF2(27047),   5 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -889,16 +889,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(30925),   0 },
-        { AOM_CDF2( 2053),  75 },
-        { AOM_CDF2( 5522),   6 },
-        { AOM_CDF2(14326),  32 },
-        { AOM_CDF2(19221),   6 },
-        { AOM_CDF2(30087),   1 },
+        { AOM_CDF2(31362),  25 },
+        { AOM_CDF2( 2991),  75 },
+        { AOM_CDF2( 6803),   1 },
+        { AOM_CDF2(19942),  32 },
+        { AOM_CDF2(22017),   6 },
+        { AOM_CDF2(32325),   5 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 4514),   1 },
-        { AOM_CDF2(12162),  31 },
-        { AOM_CDF2(21266),   6 },
+        { AOM_CDF2( 5502),   0 },
+        { AOM_CDF2(17059),  31 },
+        { AOM_CDF2(27657),  31 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -911,16 +911,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(27190),  37 },
-        { AOM_CDF2( 1099),  75 },
-        { AOM_CDF2( 5241),   4 },
-        { AOM_CDF2(11687),  32 },
-        { AOM_CDF2(16933),  40 },
-        { AOM_CDF2(27101),  32 },
+        { AOM_CDF2(27230),  62 },
+        { AOM_CDF2(  604),  80 },
+        { AOM_CDF2( 4108),   0 },
+        { AOM_CDF2(15740),  62 },
+        { AOM_CDF2(18869),  27 },
+        { AOM_CDF2(32126),  32 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 5062),  31 },
-        { AOM_CDF2(14756),  32 },
-        { AOM_CDF2(22099),  31 },
+        { AOM_CDF2( 4208),  31 },
+        { AOM_CDF2(18962),  32 },
+        { AOM_CDF2(28315),  31 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -933,16 +933,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(26974),  62 },
-        { AOM_CDF2( 2361),  29 },
-        { AOM_CDF2( 7694),  30 },
-        { AOM_CDF2(20908),  62 },
-        { AOM_CDF2(21996), 120 },
-        { AOM_CDF2(27307),  62 },
+        { AOM_CDF2(23062),  62 },
+        { AOM_CDF2(  740),  33 },
+        { AOM_CDF2( 9511),  42 },
+        { AOM_CDF2(22294),  62 },
+        { AOM_CDF2(21507),  93 },
+        { AOM_CDF2(31946),  57 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2( 2406),  62 },
+        { AOM_CDF2(18145),  31 },
+        { AOM_CDF2(24883),  33 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -957,20 +957,20 @@
     },
     {
       {
-        { AOM_CDF2(32743), 118 },
-        { AOM_CDF2(12017), 116 },
-        { AOM_CDF2(14431),   6 },
-        { AOM_CDF2(18541),   5 },
-        { AOM_CDF2(23529),   5 },
-        { AOM_CDF2(28333),   8 },
+        { AOM_CDF2(32764),   0 },
+        { AOM_CDF2(10589),  91 },
+        { AOM_CDF2(17200),   7 },
+        { AOM_CDF2(20721),   1 },
+        { AOM_CDF2(23311),   6 },
+        { AOM_CDF2(28906),   5 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 1586),   1 },
-        { AOM_CDF2(11933),   1 },
-        { AOM_CDF2(22576),  90 },
+        { AOM_CDF2( 4037),  26 },
+        { AOM_CDF2(14946),  26 },
+        { AOM_CDF2(24129),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(32072),   3 },
+        { AOM_CDF2(32128),  78 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -979,20 +979,20 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32690), 118 },
-        { AOM_CDF2(13594), 124 },
-        { AOM_CDF2(14658), 120 },
-        { AOM_CDF2(18152),  90 },
-        { AOM_CDF2(23557),  75 },
-        { AOM_CDF2(29321), 118 },
+        { AOM_CDF2(32577),  31 },
+        { AOM_CDF2(13622),  93 },
+        { AOM_CDF2(16203),  90 },
+        { AOM_CDF2(19412),  90 },
+        { AOM_CDF2(23766),  75 },
+        { AOM_CDF2(29589),   3 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 1056),   0 },
-        { AOM_CDF2(10778),   1 },
-        { AOM_CDF2(22345),   1 },
+        { AOM_CDF2( 2774),  26 },
+        { AOM_CDF2(14855),  26 },
+        { AOM_CDF2(24976),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(32151),  75 },
+        { AOM_CDF2(31738),  75 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1001,20 +1001,20 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32578),  75 },
-        { AOM_CDF2(13948), 124 },
-        { AOM_CDF2(17649), 116 },
-        { AOM_CDF2(18661),  76 },
-        { AOM_CDF2(26084),  75 },
-        { AOM_CDF2(30559),  90 },
+        { AOM_CDF2(32415),  62 },
+        { AOM_CDF2(15422),  93 },
+        { AOM_CDF2(18741),  91 },
+        { AOM_CDF2(20940),  75 },
+        { AOM_CDF2(25667),  76 },
+        { AOM_CDF2(31116),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 1503),   1 },
-        { AOM_CDF2(13773),   6 },
-        { AOM_CDF2(25790),   1 },
+        { AOM_CDF2( 3281),  31 },
+        { AOM_CDF2(17757),  31 },
+        { AOM_CDF2(27707),   1 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(30145),   2 },
+        { AOM_CDF2(29599),   7 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1023,20 +1023,20 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32018),  31 },
-        { AOM_CDF2(14713),  84 },
-        { AOM_CDF2(16085),   7 },
-        { AOM_CDF2(20831),   7 },
-        { AOM_CDF2(24132),  16 },
-        { AOM_CDF2(30161),   1 },
+        { AOM_CDF2(32182),  62 },
+        { AOM_CDF2(13890),  90 },
+        { AOM_CDF2(17539),  18 },
+        { AOM_CDF2(21145),  15 },
+        { AOM_CDF2(26833),  93 },
+        { AOM_CDF2(31582),   1 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 3201),  31 },
-        { AOM_CDF2(19212),   6 },
-        { AOM_CDF2(27653),   6 },
+        { AOM_CDF2( 4193),  27 },
+        { AOM_CDF2(21696),  32 },
+        { AOM_CDF2(29128),   6 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(21398),  62 },
+        { AOM_CDF2(26841),  62 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1045,16 +1045,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(29922),  32 },
-        { AOM_CDF2( 6502),  35 },
-        { AOM_CDF2(21194),  20 },
-        { AOM_CDF2(25437),  46 },
-        { AOM_CDF2(30629),  94 },
-        { AOM_CDF2(31813), 124 },
+        { AOM_CDF2(31681),  62 },
+        { AOM_CDF2( 9846),  32 },
+        { AOM_CDF2(21469),  32 },
+        { AOM_CDF2(24254),   7 },
+        { AOM_CDF2(29068),  92 },
+        { AOM_CDF2(31736),  32 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2( 8875),  62 },
+        { AOM_CDF2(25927),  60 },
+        { AOM_CDF2(29086),  60 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1071,16 +1071,16 @@
   {
     {
       {
-        { AOM_CDF2(26149),  78 },
-        { AOM_CDF2( 2177),  75 },
-        { AOM_CDF2( 3177),  75 },
-        { AOM_CDF2( 7716),   1 },
-        { AOM_CDF2(11613),   1 },
-        { AOM_CDF2(23660),   5 },
+        { AOM_CDF2(28021),   3 },
+        { AOM_CDF2( 4675),  75 },
+        { AOM_CDF2( 6407),  75 },
+        { AOM_CDF2(12870),   0 },
+        { AOM_CDF2(18069),   1 },
+        { AOM_CDF2(26728),  30 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 1018),  75 },
-        { AOM_CDF2(12076),  75 },
-        { AOM_CDF2(19285),   0 },
+        { AOM_CDF2( 4204),   6 },
+        { AOM_CDF2(11853),  75 },
+        { AOM_CDF2(19479),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1093,16 +1093,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(27839),  75 },
-        { AOM_CDF2( 1454), 118 },
-        { AOM_CDF2( 1988),  75 },
-        { AOM_CDF2( 6252),   1 },
-        { AOM_CDF2(10044),   6 },
-        { AOM_CDF2(22153),   6 },
+        { AOM_CDF2(30300),   0 },
+        { AOM_CDF2( 4727),   3 },
+        { AOM_CDF2( 5333),  75 },
+        { AOM_CDF2(13460),   6 },
+        { AOM_CDF2(17424),   6 },
+        { AOM_CDF2(28814),  30 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 2172),  75 },
-        { AOM_CDF2(11905),   0 },
-        { AOM_CDF2(20438),   0 },
+        { AOM_CDF2( 4777),   0 },
+        { AOM_CDF2(12522),   0 },
+        { AOM_CDF2(20439),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1115,16 +1115,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(30478),   0 },
-        { AOM_CDF2( 1746),  90 },
-        { AOM_CDF2( 2692),  76 },
-        { AOM_CDF2( 9750),   6 },
-        { AOM_CDF2(13018),   6 },
-        { AOM_CDF2(26848),   5 },
+        { AOM_CDF2(31298),  25 },
+        { AOM_CDF2( 6336),   0 },
+        { AOM_CDF2( 7488),  76 },
+        { AOM_CDF2(19193),  31 },
+        { AOM_CDF2(21405),  31 },
+        { AOM_CDF2(31491),   5 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 2970),  75 },
-        { AOM_CDF2(10430),   1 },
-        { AOM_CDF2(19344),   1 },
+        { AOM_CDF2( 5723),   0 },
+        { AOM_CDF2(15055),   1 },
+        { AOM_CDF2(23518),   1 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1137,16 +1137,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(31989),  31 },
-        { AOM_CDF2( 1131),  75 },
-        { AOM_CDF2( 2226),   7 },
-        { AOM_CDF2( 8985),  32 },
-        { AOM_CDF2(10332),   6 },
-        { AOM_CDF2(21625),  35 },
+        { AOM_CDF2(31807),  56 },
+        { AOM_CDF2( 1393),  75 },
+        { AOM_CDF2( 3549),   2 },
+        { AOM_CDF2(18574),  32 },
+        { AOM_CDF2(19795),  32 },
+        { AOM_CDF2(31792),  36 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 3945),   1 },
-        { AOM_CDF2(11479),   7 },
-        { AOM_CDF2(19011),   6 },
+        { AOM_CDF2( 5941),  31 },
+        { AOM_CDF2(16460),  32 },
+        { AOM_CDF2(25194),  31 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1159,16 +1159,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32001),  31 },
-        { AOM_CDF2( 5203),  31 },
-        { AOM_CDF2(13488),  26 },
-        { AOM_CDF2(24035),  32 },
-        { AOM_CDF2(25718),  17 },
-        { AOM_CDF2(30402),   0 },
+        { AOM_CDF2(32278),  61 },
+        { AOM_CDF2( 2582),  31 },
+        { AOM_CDF2(13992),  31 },
+        { AOM_CDF2(25993),  32 },
+        { AOM_CDF2(26283),  77 },
+        { AOM_CDF2(32056),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2( 6989),  32 },
+        { AOM_CDF2(17824),  32 },
+        { AOM_CDF2(24231),  32 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1183,20 +1183,20 @@
     },
     {
       {
-        { AOM_CDF2(32758), 103 },
-        { AOM_CDF2( 9039), 112 },
-        { AOM_CDF2(11611),   5 },
-        { AOM_CDF2(13405),  15 },
-        { AOM_CDF2(12399),  30 },
-        { AOM_CDF2(18204),   0 },
+        { AOM_CDF2(32764),   0 },
+        { AOM_CDF2( 9384),  91 },
+        { AOM_CDF2(12245),   7 },
+        { AOM_CDF2(14958),  75 },
+        { AOM_CDF2(18080),  30 },
+        { AOM_CDF2(23099),  30 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(  797),  75 },
-        { AOM_CDF2( 6774),  75 },
-        { AOM_CDF2(16118),   1 },
+        { AOM_CDF2( 2191),  90 },
+        { AOM_CDF2( 9674),   1 },
+        { AOM_CDF2(17537),   1 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(32625),  95 },
+        { AOM_CDF2(32587),  90 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1205,20 +1205,20 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32748), 123 },
-        { AOM_CDF2(13312), 124 },
-        { AOM_CDF2(12971), 124 },
-        { AOM_CDF2(17162), 118 },
-        { AOM_CDF2(22019),  93 },
-        { AOM_CDF2(28848),  75 },
+        { AOM_CDF2(32729),  18 },
+        { AOM_CDF2(12523),  93 },
+        { AOM_CDF2(13844),  93 },
+        { AOM_CDF2(16079),  93 },
+        { AOM_CDF2(21004),  90 },
+        { AOM_CDF2(25973),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(  597),  90 },
-        { AOM_CDF2( 8357),   1 },
-        { AOM_CDF2(18563),   1 },
+        { AOM_CDF2( 1860),  15 },
+        { AOM_CDF2( 9626),   1 },
+        { AOM_CDF2(18115),   1 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(29773),   0 },
+        { AOM_CDF2(31918),  25 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1227,20 +1227,20 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32746),  75 },
-        { AOM_CDF2(15541), 124 },
-        { AOM_CDF2(19956),  76 },
-        { AOM_CDF2(18718),  90 },
-        { AOM_CDF2(25385),  76 },
-        { AOM_CDF2(27478),  90 },
+        { AOM_CDF2(32727),  43 },
+        { AOM_CDF2(14244),  93 },
+        { AOM_CDF2(15808),  91 },
+        { AOM_CDF2(18087),  75 },
+        { AOM_CDF2(23066),  90 },
+        { AOM_CDF2(27617),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 1129),  75 },
-        { AOM_CDF2(13402),   6 },
-        { AOM_CDF2(22799),   1 },
+        { AOM_CDF2( 1932),   0 },
+        { AOM_CDF2(12274),   1 },
+        { AOM_CDF2(23957),   6 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(27870),   7 },
+        { AOM_CDF2(30007),   7 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1249,20 +1249,20 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32720),   6 },
-        { AOM_CDF2(13119), 121 },
-        { AOM_CDF2(24726),  82 },
-        { AOM_CDF2(20263),  76 },
-        { AOM_CDF2(23308),   1 },
-        { AOM_CDF2(29238),   5 },
+        { AOM_CDF2(32605),  56 },
+        { AOM_CDF2(14434),  92 },
+        { AOM_CDF2(21625),  78 },
+        { AOM_CDF2(21326),   2 },
+        { AOM_CDF2(25757),   5 },
+        { AOM_CDF2(30059),   8 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 1274),   1 },
-        { AOM_CDF2(19978),   7 },
-        { AOM_CDF2(30042),   6 },
+        { AOM_CDF2( 2485),  26 },
+        { AOM_CDF2(15041),   6 },
+        { AOM_CDF2(26473),   5 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(20431),  57 },
+        { AOM_CDF2(25895),  63 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1271,16 +1271,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32553),  31 },
-        { AOM_CDF2(14431),   6 },
-        { AOM_CDF2(24895),   7 },
-        { AOM_CDF2(24202),   6 },
-        { AOM_CDF2(28776),   7 },
-        { AOM_CDF2(29362),  76 },
+        { AOM_CDF2(32562),  56 },
+        { AOM_CDF2(15140),   7 },
+        { AOM_CDF2(23809),   7 },
+        { AOM_CDF2(26086),  31 },
+        { AOM_CDF2(29383),   2 },
+        { AOM_CDF2(31155),  16 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2( 4393),  51 },
+        { AOM_CDF2(17678),  33 },
+        { AOM_CDF2(25607),  56 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1297,16 +1297,16 @@
   {
     {
       {
-        { AOM_CDF2(22722),  90 },
-        { AOM_CDF2( 2145),  75 },
-        { AOM_CDF2( 2324),  90 },
-        { AOM_CDF2( 5498),   0 },
-        { AOM_CDF2( 4880),   0 },
-        { AOM_CDF2( 9950),   1 },
+        { AOM_CDF2(21443),  16 },
+        { AOM_CDF2( 4688),   0 },
+        { AOM_CDF2( 4478),  90 },
+        { AOM_CDF2( 7588),   0 },
+        { AOM_CDF2( 9776),   1 },
+        { AOM_CDF2(14682),   1 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(  346),  75 },
-        { AOM_CDF2( 4746),   0 },
-        { AOM_CDF2(10806),  45 },
+        { AOM_CDF2(  421),  90 },
+        { AOM_CDF2( 2639),  76 },
+        { AOM_CDF2( 5035),  40 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1319,16 +1319,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(27410),   0 },
-        { AOM_CDF2( 2663), 118 },
-        { AOM_CDF2( 2718), 115 },
-        { AOM_CDF2( 6587),  75 },
-        { AOM_CDF2( 8350),   1 },
-        { AOM_CDF2(15587),   6 },
+        { AOM_CDF2(27522),   0 },
+        { AOM_CDF2( 5380),  78 },
+        { AOM_CDF2( 5185),  90 },
+        { AOM_CDF2(10193),   0 },
+        { AOM_CDF2(13111),   1 },
+        { AOM_CDF2(22246),  31 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 1549),  75 },
-        { AOM_CDF2( 7068),  90 },
-        { AOM_CDF2( 9967),  90 },
+        { AOM_CDF2( 1317),   0 },
+        { AOM_CDF2( 5966),  90 },
+        { AOM_CDF2(10326),  75 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1341,16 +1341,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(30222),   0 },
-        { AOM_CDF2( 2592), 115 },
-        { AOM_CDF2( 2729),  90 },
-        { AOM_CDF2( 7930),   1 },
-        { AOM_CDF2( 8953),   6 },
-        { AOM_CDF2(19530),   6 },
+        { AOM_CDF2(30197),   6 },
+        { AOM_CDF2( 8536),   0 },
+        { AOM_CDF2( 7061),  75 },
+        { AOM_CDF2(15977),   6 },
+        { AOM_CDF2(17416),   6 },
+        { AOM_CDF2(28033),   6 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 1654),  75 },
-        { AOM_CDF2( 6118),  76 },
-        { AOM_CDF2(11631),  76 },
+        { AOM_CDF2( 2336),   0 },
+        { AOM_CDF2( 8267),  76 },
+        { AOM_CDF2(13804),  76 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1363,16 +1363,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(31109),  31 },
-        { AOM_CDF2(  935), 118 },
-        { AOM_CDF2( 1406),  76 },
-        { AOM_CDF2( 6229),   7 },
-        { AOM_CDF2( 6543),  12 },
-        { AOM_CDF2(15500),  39 },
+        { AOM_CDF2(32558),  56 },
+        { AOM_CDF2( 3796),   0 },
+        { AOM_CDF2( 4485),  76 },
+        { AOM_CDF2(16972),  32 },
+        { AOM_CDF2(17777),  37 },
+        { AOM_CDF2(29879),  35 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 3194),   1 },
-        { AOM_CDF2(10063),   2 },
-        { AOM_CDF2(16398),   2 },
+        { AOM_CDF2( 3523),   1 },
+        { AOM_CDF2(10339),   2 },
+        { AOM_CDF2(17710),   7 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1385,16 +1385,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32586), 123 },
-        { AOM_CDF2( 8079),   7 },
-        { AOM_CDF2(15142),   2 },
-        { AOM_CDF2(24722),  75 },
-        { AOM_CDF2(26585),  90 },
-        { AOM_CDF2(31608),   1 },
+        { AOM_CDF2(32683),  93 },
+        { AOM_CDF2( 6378),  32 },
+        { AOM_CDF2(13628),   2 },
+        { AOM_CDF2(24546),  76 },
+        { AOM_CDF2(26525),  90 },
+        { AOM_CDF2(31671),  75 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2( 5036),  31 },
+        { AOM_CDF2(11209),  32 },
+        { AOM_CDF2(17036),   7 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1409,20 +1409,20 @@
     },
     {
       {
-        { AOM_CDF2(30037),  54 },
-        { AOM_CDF2(16384),  24 },
-        { AOM_CDF2(16384), 103 },
-        { AOM_CDF2(16384),  49 },
-        { AOM_CDF2(16384),  90 },
-        { AOM_CDF2(16384),  20 },
+        { AOM_CDF2(32754),  50 },
+        { AOM_CDF2(12951),  93 },
+        { AOM_CDF2(15900),  93 },
+        { AOM_CDF2(14312),  16 },
+        { AOM_CDF2(17581),  15 },
+        { AOM_CDF2(19079),  18 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(   80),   3 },
-        { AOM_CDF2(16384),  26 },
-        { AOM_CDF2(16384),   9 },
+        { AOM_CDF2(  507),  93 },
+        { AOM_CDF2( 3382),  28 },
+        { AOM_CDF2( 7041),  18 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(32566),   9 },
+        { AOM_CDF2(32482),  81 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1431,20 +1431,20 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32744),  23 },
-        { AOM_CDF2(13125), 124 },
-        { AOM_CDF2(10535), 119 },
-        { AOM_CDF2(14316), 118 },
-        { AOM_CDF2(12072),  77 },
-        { AOM_CDF2(21017),  76 },
+        { AOM_CDF2(32755),  68 },
+        { AOM_CDF2(11625),  93 },
+        { AOM_CDF2(10365),  93 },
+        { AOM_CDF2(11240),  93 },
+        { AOM_CDF2(13860),  75 },
+        { AOM_CDF2(18669),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(  270),  75 },
-        { AOM_CDF2( 4425),   1 },
-        { AOM_CDF2(10923),   6 },
+        { AOM_CDF2(  620),  93 },
+        { AOM_CDF2( 4574),  76 },
+        { AOM_CDF2(11493),  83 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(32205), 105 },
+        { AOM_CDF2(31754),  75 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1453,20 +1453,20 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32758), 115 },
-        { AOM_CDF2(12734), 124 },
-        { AOM_CDF2(14371),  76 },
-        { AOM_CDF2(15925),  90 },
-        { AOM_CDF2(24258),   1 },
-        { AOM_CDF2(26907),  76 },
+        { AOM_CDF2(32749),  93 },
+        { AOM_CDF2(13494),  93 },
+        { AOM_CDF2(13995),  90 },
+        { AOM_CDF2(14723),  90 },
+        { AOM_CDF2(19850),   0 },
+        { AOM_CDF2(24076),   1 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(  540),  76 },
-        { AOM_CDF2( 5661),   6 },
-        { AOM_CDF2(13902),   6 },
+        { AOM_CDF2(  816),  75 },
+        { AOM_CDF2( 8011),   6 },
+        { AOM_CDF2(18757),  11 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(31522),   5 },
+        { AOM_CDF2(32020),   3 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1475,20 +1475,20 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32759),  76 },
-        { AOM_CDF2(12730), 123 },
-        { AOM_CDF2(12867),   7 },
-        { AOM_CDF2(15844),  77 },
-        { AOM_CDF2(28087),   9 },
-        { AOM_CDF2(29647),  47 },
+        { AOM_CDF2(32697),  37 },
+        { AOM_CDF2(12925),  90 },
+        { AOM_CDF2(14605),  80 },
+        { AOM_CDF2(15058),  77 },
+        { AOM_CDF2(23741),  18 },
+        { AOM_CDF2(25610),   6 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2( 1185),   6 },
-        { AOM_CDF2( 9765),   1 },
-        { AOM_CDF2(18440),   6 },
+        { AOM_CDF2( 1293),   5 },
+        { AOM_CDF2(11938),   1 },
+        { AOM_CDF2(22991),  32 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(18801),  64 },
+        { AOM_CDF2(26438),  65 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1497,16 +1497,16 @@
         { AOM_CDF2(16384),   0 },
       },
       {
-        { AOM_CDF2(32748),  76 },
-        { AOM_CDF2(14252),   2 },
-        { AOM_CDF2(19389),   1 },
-        { AOM_CDF2(22827),   7 },
-        { AOM_CDF2(26187),   4 },
-        { AOM_CDF2(28282),  14 },
+        { AOM_CDF2(32644),  37 },
+        { AOM_CDF2(16042),  82 },
+        { AOM_CDF2(24056),   7 },
+        { AOM_CDF2(24203),   7 },
+        { AOM_CDF2(27963),   5 },
+        { AOM_CDF2(29458),   5 },
         { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
-        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2( 2804),  57 },
+        { AOM_CDF2(19130),  43 },
+        { AOM_CDF2(26311),  60 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
         { AOM_CDF2(16384),   0 },
@@ -1526,21 +1526,21 @@
   {
     {
       {
-        { AOM_CDF2(15453),   1 },
-        { AOM_CDF2(10850),   0 },
-        { AOM_CDF2(19548),   1 },
+        { AOM_CDF2(15831),  93 },
+        { AOM_CDF2(13632),  75 },
+        { AOM_CDF2(19041),  75 },
       },
       {
-        { AOM_CDF2(16325),  75 },
-        { AOM_CDF2(14962),  75 },
-        { AOM_CDF2(18929),  75 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
       },
     },
     {
       {
-        { AOM_CDF2(15906),   1 },
-        { AOM_CDF2(12486),  75 },
-        { AOM_CDF2(18937),  75 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
       },
       {
         { AOM_CDF2(16384),   0 },
@@ -1552,21 +1552,21 @@
   {
     {
       {
-        { AOM_CDF2(16726),  75 },
-        { AOM_CDF2(11701),  75 },
-        { AOM_CDF2(19730),   0 },
+        { AOM_CDF2(16540),  93 },
+        { AOM_CDF2(14804),  93 },
+        { AOM_CDF2(18312),  93 },
       },
       {
-        { AOM_CDF2(17090),  93 },
-        { AOM_CDF2(15487),  78 },
-        { AOM_CDF2(19186),  93 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
       },
     },
     {
       {
-        { AOM_CDF2(16536),  90 },
-        { AOM_CDF2(13618),  75 },
-        { AOM_CDF2(19285),  75 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
       },
       {
         { AOM_CDF2(16384),   0 },
@@ -1578,21 +1578,21 @@
   {
     {
       {
-        { AOM_CDF2(17166),  75 },
-        { AOM_CDF2(11323),  75 },
-        { AOM_CDF2(20062),   0 },
+        { AOM_CDF2(17575),  75 },
+        { AOM_CDF2(14224),  78 },
+        { AOM_CDF2(19801),  93 },
       },
       {
-        { AOM_CDF2(17264),  93 },
-        { AOM_CDF2(15960),  90 },
-        { AOM_CDF2(19781),  93 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
       },
     },
     {
       {
-        { AOM_CDF2(16417),  75 },
-        { AOM_CDF2(12508),  75 },
-        { AOM_CDF2(20374),  75 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
       },
       {
         { AOM_CDF2(16384),   0 },
@@ -1604,21 +1604,21 @@
   {
     {
       {
-        { AOM_CDF2(18369),   0 },
-        { AOM_CDF2(12253),   1 },
-        { AOM_CDF2(19620),   0 },
+        { AOM_CDF2(20108),   1 },
+        { AOM_CDF2(14675),   0 },
+        { AOM_CDF2(20547),  93 },
       },
       {
-        { AOM_CDF2(19048),  75 },
-        { AOM_CDF2(17951),  90 },
-        { AOM_CDF2(19796),  90 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
       },
     },
     {
       {
-        { AOM_CDF2(15662),   6 },
-        { AOM_CDF2(10440),   1 },
-        { AOM_CDF2(22078),   1 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
+        { AOM_CDF2(16384),   0 },
       },
       {
         { AOM_CDF2(16384),   0 },
@@ -1631,134 +1631,134 @@
 
 static const aom_cdf_prob av1_default_coeff_lps_multi_cdfs[4][7][CDF_SIZE(4)] = {
   {
-    { AOM_CDF4(19824, 26074, 28091),   0 },
-    { AOM_CDF4(21127, 28052, 30667),  78 },
-    { AOM_CDF4(16981, 24862, 28664), 103 },
-    { AOM_CDF4(13206, 21160, 25891),  78 },
-    { AOM_CDF4(10471, 17883, 22964), 118 },
-    { AOM_CDF4( 8720, 15437, 20471), 103 },
-    { AOM_CDF4( 6269, 11597, 16021), 103 },
+    { AOM_CDF4(22305, 28743, 30345),   6 },
+    { AOM_CDF4(22663, 29948, 31320),  78 },
+    { AOM_CDF4(19776, 28658, 30435),  78 },
+    { AOM_CDF4(15436, 25313, 28181),  78 },
+    { AOM_CDF4(11214, 20671, 24854),  78 },
+    { AOM_CDF4( 8548, 16982, 21766),  78 },
+    { AOM_CDF4( 5729, 11993, 17176),  78 },
   },
   {
-    { AOM_CDF4(22683, 28011, 29483),   5 },
-    { AOM_CDF4(23879, 29807, 31582), 118 },
-    { AOM_CDF4(19643, 27253, 30267), 118 },
-    { AOM_CDF4(15573, 23809, 28011),  93 },
-    { AOM_CDF4(12402, 20350, 25225),  93 },
-    { AOM_CDF4(10221, 17535, 22608),  93 },
-    { AOM_CDF4( 6889, 12520, 16992), 118 },
+    { AOM_CDF4(24190, 30560, 31576),  30 },
+    { AOM_CDF4(24366, 30921, 31758),  78 },
+    { AOM_CDF4(21555, 29858, 31096),   3 },
+    { AOM_CDF4(16661, 26574, 28953),  78 },
+    { AOM_CDF4(11988, 21738, 25479),  93 },
+    { AOM_CDF4( 8920, 17446, 22214),  93 },
+    { AOM_CDF4( 5802, 12294, 17499),  78 },
   },
   {
-    { AOM_CDF4(27317, 30994, 31856),  75 },
-    { AOM_CDF4(24876, 30349, 31842),  93 },
-    { AOM_CDF4(20326, 27783, 30602), 118 },
-    { AOM_CDF4(15919, 24194, 28329), 118 },
-    { AOM_CDF4(12565, 20621, 25541), 115 },
-    { AOM_CDF4(10363, 17811, 22934), 118 },
-    { AOM_CDF4( 7102, 13053, 17710), 118 },
+    { AOM_CDF4(29897, 32392, 32630),  30 },
+    { AOM_CDF4(27484, 32113, 32486),   3 },
+    { AOM_CDF4(23979, 31279, 32028),   3 },
+    { AOM_CDF4(19126, 28997, 30760),   3 },
+    { AOM_CDF4(14329, 25240, 28412),   0 },
+    { AOM_CDF4(10861, 20773, 25861),  75 },
+    { AOM_CDF4( 7274, 15044, 21663),   0 },
   },
   {
-    { AOM_CDF4(28911, 31970, 32520),  32 },
-    { AOM_CDF4(26846, 31354, 32348),  75 },
-    { AOM_CDF4(22703, 29291, 31426),  77 },
-    { AOM_CDF4(18357, 26472, 29846), 102 },
-    { AOM_CDF4(14543, 22885, 27528), 120 },
-    { AOM_CDF4(11678, 20005, 25030),  25 },
-    { AOM_CDF4( 8756, 16031, 20623), 110 },
+    { AOM_CDF4(31501, 32621, 32738),  55 },
+    { AOM_CDF4(29651, 32500, 32698),   6 },
+    { AOM_CDF4(27204, 32153, 32586),  32 },
+    { AOM_CDF4(22529, 30751, 32001),  31 },
+    { AOM_CDF4(17048, 27341, 30583),  15 },
+    { AOM_CDF4(12558, 24036, 28617),   6 },
+    { AOM_CDF4( 9501, 18960, 24998),  13 },
   },
 };
 
 static const aom_cdf_prob av1_default_coeff_lps_multi_uv_cdfs[4][4][CDF_SIZE(4)] = {
   {
-    { AOM_CDF4(24100, 29563, 31289),   6 },
-    { AOM_CDF4(22448, 28885, 31071),  93 },
-    { AOM_CDF4(17701, 25572, 29153),  93 },
-    { AOM_CDF4(10401, 17438, 22074),  91 },
+    { AOM_CDF4(20014, 26541, 29552),   7 },
+    { AOM_CDF4(20674, 27680, 30329),  78 },
+    { AOM_CDF4(16228, 24293, 28314),  75 },
+    { AOM_CDF4( 9580, 16283, 20959),  75 },
   },
   {
-    { AOM_CDF4(24628, 29706, 31324),  90 },
-    { AOM_CDF4(22478, 28819, 31013), 123 },
-    { AOM_CDF4(17451, 25258, 28880), 118 },
-    { AOM_CDF4( 9999, 16711, 21246),  75 },
+    { AOM_CDF4(24442, 29827, 31535),  75 },
+    { AOM_CDF4(22490, 28954, 31256),  93 },
+    { AOM_CDF4(17882, 25670, 29377),  93 },
+    { AOM_CDF4(10664, 17735, 22437),  75 },
   },
   {
-    { AOM_CDF4(25969, 30708, 31931),  90 },
-    { AOM_CDF4(22739, 29115, 31272), 118 },
-    { AOM_CDF4(17098, 24923, 28772), 115 },
-    { AOM_CDF4(10475, 17482, 22279),  75 },
+    { AOM_CDF4(26645, 31153, 32251),  78 },
+    { AOM_CDF4(23320, 29627, 31652),  90 },
+    { AOM_CDF4(18265, 26040, 29663),  75 },
+    { AOM_CDF4(11140, 18504, 23213),   1 },
   },
   {
-    { AOM_CDF4(28465, 31762, 32366),   0 },
-    { AOM_CDF4(25610, 30882, 32100),  23 },
-    { AOM_CDF4(19724, 27881, 31089),  10 },
-    { AOM_CDF4(15206, 23453, 28302), 120 },
+    { AOM_CDF4(26977, 31598, 32364),  50 },
+    { AOM_CDF4(24721, 30575, 32124),  93 },
+    { AOM_CDF4(18803, 26659, 30610),  90 },
+    { AOM_CDF4(11757, 20385, 25284),   5 },
   },
 };
 
 static const aom_cdf_prob av1_default_coeff_lps_lf_multi_cdfs[4][14][CDF_SIZE(4)] = {
   {
-    { AOM_CDF4(11134, 16178, 19899),  37 },
-    { AOM_CDF4(14209, 21292, 25390),   0 },
-    { AOM_CDF4(10509, 17908, 22545), 120 },
-    { AOM_CDF4( 7969, 14230, 18833), 122 },
-    { AOM_CDF4( 5595, 10344, 14337),   0 },
-    { AOM_CDF4( 3765,  7274, 10572),   0 },
-    { AOM_CDF4( 1943,  3992,  5749),   0 },
-    { AOM_CDF4(13985, 20205, 23552),   6 },
-    { AOM_CDF4(15212, 22618, 26486),  75 },
-    { AOM_CDF4(12922, 20394, 24820),  78 },
-    { AOM_CDF4(10592, 17631, 22350),  78 },
-    { AOM_CDF4( 8638, 15045, 19817),  78 },
-    { AOM_CDF4( 7247, 13014, 17636), 103 },
-    { AOM_CDF4( 4779,  8939, 12611),  78 },
+    { AOM_CDF4( 7943, 14193, 20775),  32 },
+    { AOM_CDF4(14297, 22400, 26238),  91 },
+    { AOM_CDF4(10557, 18683, 22550),  90 },
+    { AOM_CDF4( 8289, 16068, 18454),  92 },
+    { AOM_CDF4( 5258, 10730, 13709),  90 },
+    { AOM_CDF4( 3933,  8166, 10680),  90 },
+    { AOM_CDF4( 2465,  5325,  6625),  90 },
+    { AOM_CDF4(10865, 16430, 19691),   6 },
+    { AOM_CDF4(14571, 22733, 26106),  15 },
+    { AOM_CDF4(14072, 23021, 25971),  75 },
+    { AOM_CDF4(11558, 20253, 23235),  78 },
+    { AOM_CDF4( 8603, 16200, 19466),  93 },
+    { AOM_CDF4( 6641, 13086, 16612),  78 },
+    { AOM_CDF4( 4240,  9043, 11946),  93 },
   },
   {
-    { AOM_CDF4(13088, 19263, 22982),   7 },
-    { AOM_CDF4(14262, 21344, 25512),  90 },
-    { AOM_CDF4(10739, 18195, 22743),  90 },
-    { AOM_CDF4( 8306, 14823, 19422),  93 },
-    { AOM_CDF4( 5893, 11028, 15278), 119 },
-    { AOM_CDF4( 4005,  7924, 11328), 124 },
-    { AOM_CDF4( 2510,  5206,  7576), 123 },
-    { AOM_CDF4(16346, 22896, 25975),   0 },
-    { AOM_CDF4(16946, 24317, 27877), 118 },
-    { AOM_CDF4(14288, 21952, 26180), 118 },
-    { AOM_CDF4(11744, 19136, 23771),  93 },
-    { AOM_CDF4( 9581, 16358, 21132),  93 },
-    { AOM_CDF4( 7955, 14043, 18682),  93 },
-    { AOM_CDF4( 5025,  9313, 12987),  94 },
+    { AOM_CDF4(11992, 17977, 23847),  37 },
+    { AOM_CDF4(14229, 22329, 26075),  90 },
+    { AOM_CDF4(11443, 20390, 22820),  76 },
+    { AOM_CDF4( 8397, 16223, 19264),  90 },
+    { AOM_CDF4( 5827, 11883, 14653),  90 },
+    { AOM_CDF4( 4416,  9159, 11664),  90 },
+    { AOM_CDF4( 2812,  6024,  7386),  93 },
+    { AOM_CDF4(16755, 23759, 26700),   5 },
+    { AOM_CDF4(17293, 25940, 28518),  93 },
+    { AOM_CDF4(15547, 25297, 27304),  93 },
+    { AOM_CDF4(12584, 22225, 24378),  93 },
+    { AOM_CDF4( 9185, 17517, 19977),  93 },
+    { AOM_CDF4( 7015, 13961, 16744),  93 },
+    { AOM_CDF4( 4509,  9609, 11858),  93 },
   },
   {
-    { AOM_CDF4(13254, 19857, 23719),   7 },
-    { AOM_CDF4(14262, 21454, 25537),  75 },
-    { AOM_CDF4(11067, 18481, 23057),  90 },
-    { AOM_CDF4( 8612, 15226, 19923),  75 },
-    { AOM_CDF4( 6093, 11413, 15998),  79 },
-    { AOM_CDF4( 4336,  8520, 12622),  24 },
-    { AOM_CDF4( 2578,  5542,  8244),  10 },
-    { AOM_CDF4(18493, 25023, 27859),  76 },
-    { AOM_CDF4(18020, 25395, 28759), 118 },
-    { AOM_CDF4(14882, 22648, 26802), 118 },
-    { AOM_CDF4(12104, 19622, 24289), 118 },
-    { AOM_CDF4( 9886, 16845, 21651), 118 },
-    { AOM_CDF4( 8242, 14551, 19269), 118 },
-    { AOM_CDF4( 5483, 10136, 14059), 118 },
+    { AOM_CDF4(13319, 21082, 26725),  37 },
+    { AOM_CDF4(15058, 23563, 27312),  75 },
+    { AOM_CDF4(12093, 21552, 24381),  91 },
+    { AOM_CDF4( 9847, 18914, 21611),  76 },
+    { AOM_CDF4( 6984, 14207, 17984),  75 },
+    { AOM_CDF4( 5580, 11627, 15411),  75 },
+    { AOM_CDF4( 3907,  8590, 10683),  81 },
+    { AOM_CDF4(19858, 26499, 28738),  31 },
+    { AOM_CDF4(19608, 28127, 30429),   0 },
+    { AOM_CDF4(17478, 27390, 29446),   0 },
+    { AOM_CDF4(14848, 25124, 27561),   0 },
+    { AOM_CDF4(11376, 21082, 24410),  75 },
+    { AOM_CDF4( 9179, 17862, 21918),  90 },
+    { AOM_CDF4( 6435, 13300, 17660),  75 },
   },
   {
-    { AOM_CDF4(13824, 20203, 23865),  37 },
-    { AOM_CDF4(15398, 22782, 26792),  75 },
-    { AOM_CDF4(12116, 19859, 24426),  79 },
-    { AOM_CDF4( 9317, 16205, 21113),  85 },
-    { AOM_CDF4( 6217, 11714, 16106), 100 },
-    { AOM_CDF4( 4063,  7613, 11221),  75 },
-    { AOM_CDF4( 1678,  3522,  5640),   0 },
-    { AOM_CDF4(21546, 27863, 30260),  20 },
-    { AOM_CDF4(20447, 27486, 30198), 115 },
-    { AOM_CDF4(17133, 24839, 28573),  75 },
-    { AOM_CDF4(13936, 21768, 26146), 115 },
-    { AOM_CDF4(11373, 18713, 23385), 115 },
-    { AOM_CDF4( 8981, 15618, 20382),  95 },
-    { AOM_CDF4( 6257, 11343, 15350),  95 },
+    { AOM_CDF4(13965, 20979, 26518),  62 },
+    { AOM_CDF4(17417, 26343, 29434),   6 },
+    { AOM_CDF4(14569, 24464, 27796),   6 },
+    { AOM_CDF4(12532, 22823, 25671),  11 },
+    { AOM_CDF4( 8586, 17291, 21825),   6 },
+    { AOM_CDF4( 6326, 13118, 17907),   6 },
+    { AOM_CDF4( 4106,  9173, 12623),  15 },
+    { AOM_CDF4(24175, 29267, 31202),  35 },
+    { AOM_CDF4(22491, 30103, 31663),   1 },
+    { AOM_CDF4(19961, 29271, 31158),   6 },
+    { AOM_CDF4(17023, 27102, 29910),   6 },
+    { AOM_CDF4(13897, 23531, 27451),   1 },
+    { AOM_CDF4(11233, 19762, 24691),   7 },
+    { AOM_CDF4( 7378, 14545, 19934),   7 },
   },
 };
 
@@ -1766,24 +1766,24 @@
   {
     {
       {
-        { AOM_CDF4( 9911, 23475, 27980),   1 },
-        { AOM_CDF4( 7466, 24475, 29860),   5 },
+        { AOM_CDF4(12360, 26392, 29943),  26 },
+        { AOM_CDF4( 8590, 25353, 30895),   6 },
       },
       {
-        { AOM_CDF4( 7431, 20151, 26724),   0 },
-        { AOM_CDF4( 3547, 15880, 24516),   0 },
+        { AOM_CDF4( 7246, 19496, 26530),  75 },
+        { AOM_CDF4( 3468, 16232, 25621),  90 },
       },
       {
-        { AOM_CDF4( 3955, 11873, 18767),  93 },
-        { AOM_CDF4( 2110,  8736, 16351),  93 },
+        { AOM_CDF4( 4008, 12605, 18928),  93 },
+        { AOM_CDF4( 1999,  9165, 16685),  93 },
       },
       {
-        { AOM_CDF4( 2387,  8923, 14103),  98 },
-        { AOM_CDF4( 1229,  6753, 12824),  98 },
+        { AOM_CDF4( 3148,  9393, 14900),  93 },
+        { AOM_CDF4( 1110,  7696, 14122),  78 },
       },
       {
-        { AOM_CDF4( 2584,  7611, 11697),  79 },
-        { AOM_CDF4( 2174,  5522, 10544), 124 },
+        { AOM_CDF4( 2543,  7526, 12021),  93 },
+        { AOM_CDF4( 2561,  5445, 10546),  93 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -1826,20 +1826,20 @@
         { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(26355, 31673, 31967),   5 },
-        { AOM_CDF4(21698, 29301, 31546),   0 },
+        { AOM_CDF4(28014, 31534, 32060),   5 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(10160, 21589, 27759), 115 },
-        { AOM_CDF4( 9867, 21454, 27578),  75 },
+        { AOM_CDF4(13135, 23487, 28599),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 5721, 15490, 20552),  98 },
-        { AOM_CDF4( 4143, 12020, 18749), 120 },
+        { AOM_CDF4( 7049, 15368, 20768),  93 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 3802,  8540, 13391),  76 },
-        { AOM_CDF4( 1774,  6392, 11297),  96 },
+        { AOM_CDF4( 3109,  8054, 12383),  75 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -1848,228 +1848,228 @@
     },
     {
       {
-        { AOM_CDF4(25509, 32561, 32672),  98 },
-        { AOM_CDF4(12988, 31640, 32582),  93 },
+        { AOM_CDF4(25298, 32426, 32713),  93 },
+        { AOM_CDF4(14651, 31551, 32591),  93 },
       },
       {
-        { AOM_CDF4(18698, 30842, 32313),  90 },
-        { AOM_CDF4(  594, 27488, 31893),  90 },
+        { AOM_CDF4(18466, 30483, 32267),  75 },
+        { AOM_CDF4(  306, 26643, 31787),  90 },
       },
       {
-        { AOM_CDF4(12530, 26543, 30912),  75 },
-        { AOM_CDF4( 1486, 21670, 29502),   0 },
+        { AOM_CDF4(12399, 26150, 30691),  90 },
+        { AOM_CDF4( 1131, 21210, 29129),  75 },
       },
       {
-        { AOM_CDF4( 7692, 20402, 27137), 118 },
-        { AOM_CDF4( 1113, 14704, 24576), 100 },
+        { AOM_CDF4( 7487, 20115, 26881),  93 },
+        { AOM_CDF4(  656, 14639, 24430),  75 },
       },
       {
-        { AOM_CDF4( 3558, 10943, 16907),  78 },
-        { AOM_CDF4(  724,  7680, 14468),  93 },
+        { AOM_CDF4( 3588, 11042, 17169),  78 },
+        { AOM_CDF4(  756,  7796, 14913),  78 },
       },
       {
-        { AOM_CDF4(26931, 32549, 32694), 103 },
-        { AOM_CDF4(15071, 31732, 32618),  78 },
+        { AOM_CDF4(26570, 32443, 32691),  78 },
+        { AOM_CDF4(17559, 31708, 32628),  78 },
       },
       {
-        { AOM_CDF4(19084, 30691, 32236),  90 },
-        { AOM_CDF4(  830, 27097, 31813),  90 },
+        { AOM_CDF4(18312, 30354, 32288),  90 },
+        { AOM_CDF4(  581, 26605, 31701),  90 },
       },
       {
-        { AOM_CDF4(12249, 26154, 30609),  90 },
-        { AOM_CDF4( 1280, 21242, 29138),  75 },
+        { AOM_CDF4(11812, 25791, 30572),  75 },
+        { AOM_CDF4( 1073, 20736, 28973),  75 },
       },
       {
-        { AOM_CDF4( 7240, 19420, 26513),  93 },
-        { AOM_CDF4( 1137, 14246, 24261),  98 },
+        { AOM_CDF4( 7165, 19304, 26609),  93 },
+        { AOM_CDF4(  971, 14401, 24415),  93 },
       },
       {
-        { AOM_CDF4( 3820, 12097, 18705),  78 },
-        { AOM_CDF4( 1134,  8005, 15383),  78 },
+        { AOM_CDF4( 3978, 12366, 19160),  93 },
+        { AOM_CDF4(  935,  8823, 16611),  78 },
       },
       {
-        { AOM_CDF4(27133, 32439, 32676),  80 },
-        { AOM_CDF4(15403, 31421, 32531),  75 },
+        { AOM_CDF4(25670, 32230, 32678),  75 },
+        { AOM_CDF4(19556, 31721, 32677),   0 },
       },
       {
-        { AOM_CDF4(18195, 30297, 32087),  75 },
-        { AOM_CDF4( 1523, 27081, 31571),  90 },
+        { AOM_CDF4(17121, 29735, 32054),  75 },
+        { AOM_CDF4( 1460, 26595, 31623),  90 },
       },
       {
-        { AOM_CDF4(12135, 26136, 30637),  90 },
-        { AOM_CDF4( 2161, 21148, 28932),  93 },
+        { AOM_CDF4(11589, 25561, 30426),  90 },
+        { AOM_CDF4( 1652, 20606, 28939),  78 },
       },
       {
-        { AOM_CDF4( 7592, 20384, 27162),  95 },
-        { AOM_CDF4( 1282, 14451, 24183),  90 },
+        { AOM_CDF4( 7343, 20631, 27574),  90 },
+        { AOM_CDF4(  922, 15328, 25115),  75 },
       },
       {
-        { AOM_CDF4( 4501, 13020, 20010),  75 },
-        { AOM_CDF4( 1033,  9449, 17295),  78 },
+        { AOM_CDF4( 4778, 14146, 21151),  90 },
+        { AOM_CDF4(  902,  9679, 18420),  78 },
       },
       {
-        { AOM_CDF4(28771, 32520, 32691),   5 },
-        { AOM_CDF4(25566, 31723, 32508),  75 },
+        { AOM_CDF4(30964, 32538, 32693),   5 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(19424, 30341, 32063), 123 },
-        { AOM_CDF4( 6882, 28090, 31664), 100 },
+        { AOM_CDF4(18212, 29081, 31586),  93 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(12826, 25901, 30379),  90 },
-        { AOM_CDF4( 1770, 21646, 28894),  90 },
+        { AOM_CDF4(10647, 22153, 27538),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 8377, 20578, 27179),  75 },
-        { AOM_CDF4( 1573, 15815, 25349),  90 },
+        { AOM_CDF4( 6396, 16045, 22849),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 4649, 13924, 20629),  75 },
-        { AOM_CDF4( 1503,  9789, 17292),   0 },
+        { AOM_CDF4( 3574, 10559, 16078),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
     },
     {
       {
-        { AOM_CDF4(28854, 32695, 32748), 115 },
-        { AOM_CDF4(12411, 32167, 32710), 120 },
+        { AOM_CDF4(28697, 32692, 32748),  90 },
+        { AOM_CDF4(13717, 32316, 32740),  90 },
       },
       {
-        { AOM_CDF4(24388, 32501, 32687), 115 },
-        { AOM_CDF4( 1625, 30542, 32488),  75 },
+        { AOM_CDF4(24783, 32374, 32712),  90 },
+        { AOM_CDF4( 1229, 30871, 32600),  75 },
       },
       {
-        { AOM_CDF4(19525, 31055, 32369),  75 },
-        { AOM_CDF4( 2639, 27754, 31832),  90 },
+        { AOM_CDF4(19000, 30799, 32442),  75 },
+        { AOM_CDF4( 2583, 27380, 31887),  15 },
       },
       {
-        { AOM_CDF4(10554, 24158, 29743),  90 },
-        { AOM_CDF4( 1130, 19180, 27829),  75 },
+        { AOM_CDF4(10656, 24633, 30053),  75 },
+        { AOM_CDF4(  882, 19759, 28348),  75 },
       },
       {
-        { AOM_CDF4( 3789, 10960, 16575), 118 },
-        { AOM_CDF4(  520,  7283, 13933),  75 },
+        { AOM_CDF4( 4024, 11749, 17822),  75 },
+        { AOM_CDF4(  311,  8254, 15425),  75 },
       },
       {
-        { AOM_CDF4(29715, 32710, 32748), 120 },
-        { AOM_CDF4(17447, 32494, 32748),   0 },
+        { AOM_CDF4(29761, 32708, 32748),  75 },
+        { AOM_CDF4(18251, 32567, 32748),   0 },
       },
       {
-        { AOM_CDF4(25092, 32480, 32689),  75 },
-        { AOM_CDF4( 2354, 30996, 32522),  78 },
+        { AOM_CDF4(24756, 32428, 32722),  75 },
+        { AOM_CDF4( 1802, 30951, 32542),  93 },
       },
       {
-        { AOM_CDF4(19759, 30919, 32342),  75 },
-        { AOM_CDF4( 3224, 28062, 31824),  93 },
+        { AOM_CDF4(18650, 30593, 32394),  75 },
+        { AOM_CDF4( 2883, 27721, 31874),  78 },
       },
       {
-        { AOM_CDF4(10218, 24406, 29721),  75 },
-        { AOM_CDF4(  553, 18678, 27497),   1 },
+        { AOM_CDF4(10280, 24576, 29914),  75 },
+        { AOM_CDF4(  288, 19075, 28254),   1 },
       },
       {
-        { AOM_CDF4( 3903, 11809, 18079),  90 },
-        { AOM_CDF4(  876,  8023, 15164),  93 },
+        { AOM_CDF4( 3976, 12847, 19261),  75 },
+        { AOM_CDF4(  754,  8850, 16554),   3 },
       },
       {
-        { AOM_CDF4(30501, 32742, 32748), 115 },
-        { AOM_CDF4(23059, 32635, 32748),   0 },
+        { AOM_CDF4(30346, 32725, 32748),  75 },
+        { AOM_CDF4(24555, 32672, 32748),   5 },
       },
       {
-        { AOM_CDF4(25215, 32497, 32719),   5 },
-        { AOM_CDF4( 1312, 31296, 32598),  75 },
+        { AOM_CDF4(24866, 32414, 32726),  75 },
+        { AOM_CDF4(  857, 31274, 32665),  90 },
       },
       {
-        { AOM_CDF4(19118, 30779, 32380),  78 },
-        { AOM_CDF4( 2213, 27623, 31932), 118 },
+        { AOM_CDF4(18664, 30690, 32404),  93 },
+        { AOM_CDF4( 2459, 27485, 31962),  93 },
       },
       {
-        { AOM_CDF4( 9961, 24369, 30152), 118 },
-        { AOM_CDF4( 1179, 18947, 28027),  78 },
+        { AOM_CDF4(10302, 24628, 30393),  93 },
+        { AOM_CDF4(  923, 19581, 28849),  78 },
       },
       {
-        { AOM_CDF4( 4812, 14034, 21158),  94 },
-        { AOM_CDF4(  670,  9913, 18145),  78 },
+        { AOM_CDF4( 5108, 14969, 22262),  78 },
+        { AOM_CDF4(  637, 11172, 20006),  78 },
       },
       {
-        { AOM_CDF4(31081, 32752, 32756),   0 },
-        { AOM_CDF4(32217, 32694, 32748),  40 },
+        { AOM_CDF4(32114, 32706, 32748),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(25544, 32468, 32720),  90 },
-        { AOM_CDF4(12903, 32263, 32687),   0 },
+        { AOM_CDF4(22647, 31591, 32522),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(19559, 31187, 32323),   5 },
-        { AOM_CDF4( 7208, 27848, 31639),  75 },
+        { AOM_CDF4(14439, 26903, 30661),   6 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 8580, 23093, 29482),   7 },
-        { AOM_CDF4( 3378, 19711, 27979),   2 },
+        { AOM_CDF4( 7410, 19635, 26647),   1 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 3732, 13062, 18362),  99 },
-        { AOM_CDF4(  973,  7781, 16309),  99 },
+        { AOM_CDF4( 3267, 10417, 16526),  92 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
     },
     {
       {
-        { AOM_CDF4(28282, 32549, 32747),   1 },
-        { AOM_CDF4(11860, 32474, 32713), 105 },
+        { AOM_CDF4(29459, 32676, 32741),  26 },
+        { AOM_CDF4(12621, 32434, 32748),  83 },
       },
       {
-        { AOM_CDF4(21596, 31855, 32593),  75 },
-        { AOM_CDF4( 6499, 29302, 32354), 115 },
+        { AOM_CDF4(23667, 32112, 32701),  75 },
+        { AOM_CDF4( 5563, 30354, 32581),  75 },
       },
       {
-        { AOM_CDF4(17775, 30322, 32504),   0 },
-        { AOM_CDF4( 4755, 26204, 31331),  90 },
+        { AOM_CDF4(19383, 30660, 32564),  75 },
+        { AOM_CDF4( 3845, 27375, 31697),  90 },
       },
       {
-        { AOM_CDF4( 9759, 24406, 29260),  78 },
-        { AOM_CDF4( 2287, 19324, 27443), 115 },
+        { AOM_CDF4(10075, 24894, 29897),  90 },
+        { AOM_CDF4( 2073, 19727, 27880),  78 },
       },
       {
-        { AOM_CDF4( 3377,  9366, 13633),  76 },
-        { AOM_CDF4(  797,  6396, 12389),   1 },
+        { AOM_CDF4( 3368,  9398, 13892),  81 },
+        { AOM_CDF4(  571,  6307, 12048),  81 },
       },
       {
-        { AOM_CDF4(30527, 32752, 32756),   0 },
-        { AOM_CDF4(15980, 32344, 32738),  20 },
+        { AOM_CDF4(30541, 32712, 32748),  18 },
+        { AOM_CDF4(17105, 32518, 32748),  90 },
       },
       {
-        { AOM_CDF4(25230, 32333, 32707),  78 },
-        { AOM_CDF4( 2908, 31470, 32664),  91 },
+        { AOM_CDF4(26380, 32437, 32736),  78 },
+        { AOM_CDF4( 1892, 31537, 32682),  91 },
       },
       {
-        { AOM_CDF4(19476, 30970, 32442),  90 },
-        { AOM_CDF4( 3271, 28129, 32278),   0 },
+        { AOM_CDF4(20557, 31281, 32473),  90 },
+        { AOM_CDF4( 3148, 28251, 32121),   0 },
       },
       {
-        { AOM_CDF4(11357, 25813, 30250),   5 },
-        { AOM_CDF4( 4200, 20358, 28587),  76 },
+        { AOM_CDF4(10605, 25976, 30389),  76 },
+        { AOM_CDF4( 3627, 20150, 28517),  76 },
       },
       {
-        { AOM_CDF4( 3467, 10601, 15034),  76 },
-        { AOM_CDF4(  633,  6909, 12886), 100 },
+        { AOM_CDF4( 3792, 11134, 15907),  81 },
+        { AOM_CDF4(  517,  7539, 13580),  81 },
       },
       {
-        { AOM_CDF4(30357, 32752, 32756),  90 },
-        { AOM_CDF4(32487, 32636, 32748),  20 },
+        { AOM_CDF4(30408, 32748, 32752),  75 },
+        { AOM_CDF4(32291, 32705, 32748),  75 },
       },
       {
-        { AOM_CDF4(25416, 32651, 32737), 115 },
-        { AOM_CDF4( 6470, 31368, 32554), 118 },
+        { AOM_CDF4(25730, 32585, 32739),  90 },
+        { AOM_CDF4( 5942, 31616, 32616),  93 },
       },
       {
-        { AOM_CDF4(19673, 30970, 32437), 118 },
-        { AOM_CDF4( 1222, 28493, 32131),  93 },
+        { AOM_CDF4(20185, 31076, 32464),  78 },
+        { AOM_CDF4( 1004, 28344, 32094),  78 },
       },
       {
-        { AOM_CDF4(11450, 25887, 30574), 123 },
-        { AOM_CDF4( 1683, 21008, 29386), 118 },
+        { AOM_CDF4(11707, 26199, 30689),  93 },
+        { AOM_CDF4( 1262, 21328, 29569),  93 },
       },
       {
-        { AOM_CDF4( 4818, 14687, 20709),  90 },
-        { AOM_CDF4( 1164,  9850, 17767),  90 },
+        { AOM_CDF4( 5035, 14930, 21229),  90 },
+        { AOM_CDF4(  746, 10699, 18756),  90 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -2094,64 +2094,64 @@
     },
     {
       {
-        { AOM_CDF4(27354, 31913, 32483),  73 },
-        { AOM_CDF4(11852, 31374, 32536),  24 },
+        { AOM_CDF4(28383, 32609, 32688),  10 },
+        { AOM_CDF4(15428, 32067, 32704),  35 },
       },
       {
-        { AOM_CDF4(10645, 30772, 32103),  24 },
-        { AOM_CDF4( 5783, 26343, 30037), 122 },
+        { AOM_CDF4(15754, 30788, 32588),  90 },
+        { AOM_CDF4( 4880, 29631, 31606),   0 },
       },
       {
-        { AOM_CDF4(11886, 25540, 31804),  84 },
-        { AOM_CDF4( 8908, 22588, 29428),  22 },
+        { AOM_CDF4(10550, 24328, 32147),  75 },
+        { AOM_CDF4( 8738, 22209, 29673),  75 },
       },
       {
-        { AOM_CDF4( 7761, 22420, 26732),  20 },
-        { AOM_CDF4( 2913, 17234, 27671),  95 },
+        { AOM_CDF4( 9695, 22879, 26951),  25 },
+        { AOM_CDF4( 1798, 15785, 27773),  75 },
       },
       {
-        { AOM_CDF4( 2602,  9025, 12603),   1 },
-        { AOM_CDF4( 1285,  6184, 11324),   7 },
+        { AOM_CDF4( 3427, 10282, 14127),  93 },
+        { AOM_CDF4( 1687,  7815, 14031),  78 },
       },
       {
-        { AOM_CDF4(29092, 32448, 32608),  69 },
-        { AOM_CDF4( 7858, 31431, 32601), 111 },
+        { AOM_CDF4(31560, 32315, 32617),  65 },
+        { AOM_CDF4(12105, 31933, 32351),  75 },
       },
       {
-        { AOM_CDF4(21517, 31362, 32487),  49 },
-        { AOM_CDF4( 6411, 27639, 32626),  12 },
+        { AOM_CDF4(20436, 29949, 32063),   0 },
+        { AOM_CDF4( 6712, 28623, 32571),  25 },
       },
       {
-        { AOM_CDF4(11214, 28108, 31312),   9 },
-        { AOM_CDF4( 7206, 21445, 29508),  34 },
+        { AOM_CDF4( 9717, 28135, 31186),  15 },
+        { AOM_CDF4( 8249, 24519, 30362),  40 },
       },
       {
-        { AOM_CDF4( 6995, 23748, 27798),  99 },
-        { AOM_CDF4(10454, 11660, 24727),  20 },
+        { AOM_CDF4( 7123, 25288, 28494),  10 },
+        { AOM_CDF4(11556, 14880, 27228),  10 },
       },
       {
-        { AOM_CDF4( 3874,  9524, 13963),  26 },
-        { AOM_CDF4(  936,  6468, 12256),   6 },
+        { AOM_CDF4( 4041, 10893, 15462),   5 },
+        { AOM_CDF4(  794, 10029, 17278),  18 },
       },
       {
-        { AOM_CDF4(28353, 32713, 32748),  90 },
-        { AOM_CDF4(31550, 32740, 32748),  15 },
+        { AOM_CDF4(28664, 32744, 32748),   0 },
+        { AOM_CDF4(31632, 32700, 32740),  15 },
       },
       {
-        { AOM_CDF4(25877, 32529, 32733), 109 },
-        { AOM_CDF4( 8162, 31635, 32661), 119 },
+        { AOM_CDF4(26708, 32579, 32742),  78 },
+        { AOM_CDF4( 6672, 31742, 32705),  93 },
       },
       {
-        { AOM_CDF4(20541, 31441, 32577),  93 },
-        { AOM_CDF4( 1666, 28501, 32344), 103 },
+        { AOM_CDF4(20833, 31645, 32639),  93 },
+        { AOM_CDF4( 1146, 29311, 32329),  93 },
       },
       {
-        { AOM_CDF4(12767, 27183, 31213),  93 },
-        { AOM_CDF4( 2261, 22344, 30204), 100 },
+        { AOM_CDF4(13676, 28227, 31721),  93 },
+        { AOM_CDF4( 1479, 24229, 30975),  78 },
       },
       {
-        { AOM_CDF4( 4507, 13756, 19425), 120 },
-        { AOM_CDF4( 1320,  9309, 16783), 115 },
+        { AOM_CDF4( 5792, 15556, 21640),  91 },
+        { AOM_CDF4( 1677, 10836, 19468),  91 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -2178,24 +2178,24 @@
   {
     {
       {
-        { AOM_CDF4(11002, 24278, 28599),  30 },
-        { AOM_CDF4( 7635, 25247, 30573),  30 },
+        { AOM_CDF4(12507, 26077, 30060),  30 },
+        { AOM_CDF4( 7550, 25098, 30550),  30 },
       },
       {
-        { AOM_CDF4( 9342, 22895, 28499),   5 },
-        { AOM_CDF4( 2898, 18765, 27310),   0 },
+        { AOM_CDF4( 8009, 20715, 27321),   3 },
+        { AOM_CDF4( 3223, 17464, 26650),   3 },
       },
       {
-        { AOM_CDF4( 4722, 14185, 21265),   0 },
-        { AOM_CDF4( 1870,  9779, 17974),   3 },
+        { AOM_CDF4( 4305, 13150, 20144),  93 },
+        { AOM_CDF4( 1952, 10128, 18324),   3 },
       },
       {
-        { AOM_CDF4( 2765,  9205, 15256),  93 },
-        { AOM_CDF4(  906,  6582, 12719), 120 },
+        { AOM_CDF4( 3098,  9586, 15580),  93 },
+        { AOM_CDF4( 1089,  7195, 13810),  93 },
       },
       {
-        { AOM_CDF4( 1502,  5720,  9797),  93 },
-        { AOM_CDF4(  898,  3846,  7965),  93 },
+        { AOM_CDF4( 1728,  6104, 10373),  93 },
+        { AOM_CDF4( 1235,  4736,  9683),  93 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -2238,20 +2238,20 @@
         { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(26827, 32314, 32367),   0 },
-        { AOM_CDF4(22720, 29196, 31720),  78 },
+        { AOM_CDF4(27562, 31970, 32298),  75 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 9789, 22978, 28620),  75 },
-        { AOM_CDF4( 9490, 21290, 28388),  75 },
+        { AOM_CDF4(11965, 23262, 28482),  75 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 5484, 15035, 21213),  93 },
-        { AOM_CDF4( 3766, 11712, 18984),  91 },
+        { AOM_CDF4( 6254, 14791, 20469),  78 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 1491,  6548, 11124),   3 },
-        { AOM_CDF4(  618,  5212, 10994), 120 },
+        { AOM_CDF4( 1646,  6619, 10696),  93 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -2260,228 +2260,228 @@
     },
     {
       {
-        { AOM_CDF4(26269, 32250, 32581),  90 },
-        { AOM_CDF4(12884, 31467, 32486),  78 },
+        { AOM_CDF4(25334, 31967, 32621),  90 },
+        { AOM_CDF4(15582, 31040, 32462),  78 },
       },
       {
-        { AOM_CDF4(20239, 31267, 32400),  75 },
-        { AOM_CDF4(  672, 28214, 32024),  75 },
+        { AOM_CDF4(18907, 30472, 32314),  90 },
+        { AOM_CDF4(  953, 26945, 31805),  75 },
       },
       {
-        { AOM_CDF4(15311, 28636, 31503),  75 },
-        { AOM_CDF4( 1992, 24440, 30564),   0 },
+        { AOM_CDF4(13516, 26908, 30904),  75 },
+        { AOM_CDF4( 1549, 21936, 29542),   0 },
       },
       {
-        { AOM_CDF4( 9111, 22219, 28171),  78 },
-        { AOM_CDF4(  983, 16993, 26154),   0 },
+        { AOM_CDF4( 8297, 20991, 27437),  78 },
+        { AOM_CDF4(  557, 15598, 25261),   0 },
       },
       {
-        { AOM_CDF4( 4051, 11724, 17568),   3 },
-        { AOM_CDF4(  999,  8044, 15026),   3 },
+        { AOM_CDF4( 3980, 11626, 17598),   3 },
+        { AOM_CDF4(  918,  8073, 15400),   3 },
       },
       {
-        { AOM_CDF4(26941, 32326, 32613),   5 },
-        { AOM_CDF4(13971, 31827, 32558),  90 },
+        { AOM_CDF4(26391, 32035, 32595),  75 },
+        { AOM_CDF4(17672, 31342, 32493),   0 },
       },
       {
-        { AOM_CDF4(21181, 31492, 32450),  75 },
-        { AOM_CDF4(  721, 29088, 32150),  75 },
+        { AOM_CDF4(19580, 30651, 32319),  75 },
+        { AOM_CDF4(  589, 27593, 31900),  75 },
       },
       {
-        { AOM_CDF4(16062, 29048, 31631),   0 },
-        { AOM_CDF4( 2165, 25111, 30769),   0 },
+        { AOM_CDF4(13734, 27193, 31043),   0 },
+        { AOM_CDF4( 1624, 22701, 29917),   0 },
       },
       {
-        { AOM_CDF4( 8958, 22223, 28345),   3 },
-        { AOM_CDF4(  870, 17027, 26234),   0 },
+        { AOM_CDF4( 8311, 21239, 27850),   3 },
+        { AOM_CDF4(  510, 15971, 25802),   0 },
       },
       {
-        { AOM_CDF4( 4338, 12665, 19168),   3 },
-        { AOM_CDF4(  565,  8976, 16711),   3 },
+        { AOM_CDF4( 4217, 12744, 19511),   3 },
+        { AOM_CDF4(  717,  9081, 16951),   3 },
       },
       {
-        { AOM_CDF4(28370, 32559, 32688),  30 },
-        { AOM_CDF4(15977, 31944, 32627),   5 },
+        { AOM_CDF4(25094, 32069, 32616),   5 },
+        { AOM_CDF4(17839, 31778, 32640),   5 },
       },
       {
-        { AOM_CDF4(22467, 31867, 32552),  75 },
-        { AOM_CDF4( 2046, 30051, 32343),  75 },
+        { AOM_CDF4(19672, 30814, 32312),  75 },
+        { AOM_CDF4( 2025, 28482, 32043),  75 },
       },
       {
-        { AOM_CDF4(17466, 29933, 32033),   0 },
-        { AOM_CDF4( 1991, 26676, 31416),   0 },
+        { AOM_CDF4(14800, 28188, 31442),   0 },
+        { AOM_CDF4( 1221, 24055, 30573),   0 },
       },
       {
-        { AOM_CDF4( 9933, 23928, 29552),   3 },
-        { AOM_CDF4( 1613, 19041, 27807),   3 },
+        { AOM_CDF4( 8995, 22820, 28992),   3 },
+        { AOM_CDF4( 1167, 17916, 27275),   3 },
       },
       {
-        { AOM_CDF4( 4931, 14533, 21644),  78 },
-        { AOM_CDF4(  969, 10299, 18631),   3 },
+        { AOM_CDF4( 4844, 14798, 22123),  78 },
+        { AOM_CDF4(  839, 10591, 19419),   3 },
       },
       {
-        { AOM_CDF4(29960, 32673, 32716),   0 },
-        { AOM_CDF4(26617, 32170, 32597),  75 },
+        { AOM_CDF4(30845, 32589, 32713),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(21657, 31204, 32351),  75 },
-        { AOM_CDF4( 6501, 28784, 32022),  75 },
+        { AOM_CDF4(19409, 29802, 31864),  75 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(15333, 27691, 30969),   0 },
-        { AOM_CDF4(  754, 22911, 29565),   0 },
+        { AOM_CDF4(11114, 22871, 27848),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 9040, 21696, 27445),   0 },
-        { AOM_CDF4( 1340, 16493, 25380),   0 },
+        { AOM_CDF4( 6092, 16202, 22429),   5 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 4165, 12290, 18104),  75 },
-        { AOM_CDF4(  717,  8616, 15740),  90 },
+        { AOM_CDF4( 3247,  9679, 15027),  90 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
     },
     {
       {
-        { AOM_CDF4(28102, 32642, 32747),  75 },
-        { AOM_CDF4(11192, 32121, 32682),  75 },
+        { AOM_CDF4(27264, 32622, 32748),  75 },
+        { AOM_CDF4(13182, 32042, 32728),  75 },
       },
       {
-        { AOM_CDF4(22720, 32094, 32631),  75 },
-        { AOM_CDF4( 1029, 29647, 32431),  75 },
+        { AOM_CDF4(22849, 32019, 32682),  75 },
+        { AOM_CDF4(  491, 29944, 32540),  75 },
       },
       {
-        { AOM_CDF4(17617, 30103, 32178),  75 },
-        { AOM_CDF4( 2186, 26319, 31518),  75 },
+        { AOM_CDF4(17618, 30067, 32261),  75 },
+        { AOM_CDF4( 1861, 25960, 31490),  75 },
       },
       {
-        { AOM_CDF4(10164, 24321, 29798),  75 },
-        { AOM_CDF4( 1541, 18791, 27852),  78 },
+        { AOM_CDF4(10036, 24382, 29998),  75 },
+        { AOM_CDF4( 1347, 18931, 28166),  78 },
       },
       {
-        { AOM_CDF4( 4569, 13369, 19570),  75 },
-        { AOM_CDF4(  430,  9398, 17094),   0 },
+        { AOM_CDF4( 5051, 14703, 21347),  75 },
+        { AOM_CDF4(  259, 10600, 19087),   0 },
       },
       {
-        { AOM_CDF4(29415, 32696, 32748),  75 },
-        { AOM_CDF4(17471, 32468, 32725),   0 },
+        { AOM_CDF4(29595, 32710, 32748),  75 },
+        { AOM_CDF4(19929, 32553, 32748),   0 },
       },
       {
-        { AOM_CDF4(24255, 32400, 32684),  75 },
-        { AOM_CDF4( 2056, 30672, 32547),  75 },
+        { AOM_CDF4(24721, 32388, 32722),  75 },
+        { AOM_CDF4( 1482, 30913, 32625),  75 },
       },
       {
-        { AOM_CDF4(18920, 30859, 32391),   0 },
-        { AOM_CDF4( 1658, 27471, 31907),   0 },
+        { AOM_CDF4(18729, 30720, 32485),   0 },
+        { AOM_CDF4( 1645, 27442, 31977),   0 },
       },
       {
-        { AOM_CDF4(10691, 25259, 30411),  93 },
-        { AOM_CDF4( 1318, 19777, 28708),  93 },
+        { AOM_CDF4(10807, 25638, 30749),  75 },
+        { AOM_CDF4( 1150, 20387, 29227),   3 },
       },
       {
-        { AOM_CDF4( 4853, 14405, 21019),  75 },
-        { AOM_CDF4(  552, 10170, 18305),   0 },
+        { AOM_CDF4( 5546, 16487, 23567),   0 },
+        { AOM_CDF4(  403, 12249, 21372),   0 },
       },
       {
-        { AOM_CDF4(30584, 32731, 32748),  10 },
-        { AOM_CDF4(23983, 32663, 32748),   0 },
+        { AOM_CDF4(30695, 32738, 32748),  80 },
+        { AOM_CDF4(25061, 32689, 32748),   0 },
       },
       {
-        { AOM_CDF4(26226, 32602, 32732),  80 },
-        { AOM_CDF4( 2213, 31721, 32632),   0 },
+        { AOM_CDF4(26547, 32580, 32747),  75 },
+        { AOM_CDF4( 1334, 31785, 32708),  75 },
       },
       {
-        { AOM_CDF4(21116, 31671, 32553),   5 },
-        { AOM_CDF4( 3052, 29248, 32288),  78 },
+        { AOM_CDF4(20996, 31697, 32662),   0 },
+        { AOM_CDF4( 3682, 29397, 32392),  78 },
       },
       {
-        { AOM_CDF4(12457, 27032, 31218),   3 },
-        { AOM_CDF4( 1152, 21857, 29902),  78 },
+        { AOM_CDF4(13209, 28091, 31805),   3 },
+        { AOM_CDF4(  840, 23372, 30922),   3 },
       },
       {
-        { AOM_CDF4( 5938, 16655, 23702),   3 },
-        { AOM_CDF4(  470, 12098, 20941),   0 },
+        { AOM_CDF4( 7389, 20059, 27005),   0 },
+        { AOM_CDF4(  332, 15296, 25093),   0 },
       },
       {
-        { AOM_CDF4(31236, 32752, 32756),  75 },
-        { AOM_CDF4(32626, 32657, 32747), 115 },
+        { AOM_CDF4(32282, 32726, 32748),  15 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(24830, 32210, 32643),  75 },
-        { AOM_CDF4(11977, 30847, 32503),  93 },
+        { AOM_CDF4(23211, 31638, 32504),  90 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(17202, 29314, 31855),  75 },
-        { AOM_CDF4( 3761, 25105, 30992),  75 },
+        { AOM_CDF4(13980, 26668, 30388),   1 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 8894, 22748, 28997),  90 },
-        { AOM_CDF4( 1417, 18345, 27236),  18 },
+        { AOM_CDF4( 7795, 19288, 25941),   6 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 4554, 14484, 21831),  78 },
-        { AOM_CDF4( 1276, 11326, 19495),  98 },
+        { AOM_CDF4( 3877, 11700, 17890),   1 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
     },
     {
       {
-        { AOM_CDF4(28429, 32590, 32748),   0 },
-        { AOM_CDF4(10471, 32353, 32722),  91 },
+        { AOM_CDF4(28880, 32680, 32748),   0 },
+        { AOM_CDF4(12427, 32347, 32748),  90 },
       },
       {
-        { AOM_CDF4(23081, 32002, 32639),  78 },
-        { AOM_CDF4( 2638, 30460, 32556),  76 },
+        { AOM_CDF4(24025, 32081, 32704),  75 },
+        { AOM_CDF4( 2065, 30727, 32657),  76 },
       },
       {
-        { AOM_CDF4(19093, 30527, 32281),  75 },
-        { AOM_CDF4( 1502, 27612, 31946),  76 },
+        { AOM_CDF4(19872, 30769, 32395),   0 },
+        { AOM_CDF4( 1210, 27547, 31961),  76 },
       },
       {
-        { AOM_CDF4(10247, 24716, 29895),  90 },
-        { AOM_CDF4( 2487, 19280, 27993),  15 },
+        { AOM_CDF4(10410, 24769, 29817),   1 },
+        { AOM_CDF4( 2247, 19228, 27805),   1 },
       },
       {
-        { AOM_CDF4( 4115, 11673, 17004),  93 },
-        { AOM_CDF4(  294,  8279, 15142),   1 },
+        { AOM_CDF4( 3997, 11545, 16952),  75 },
+        { AOM_CDF4(  146,  7698, 14688),   1 },
       },
       {
-        { AOM_CDF4(30029, 32682, 32748),  75 },
-        { AOM_CDF4(16134, 32602, 32748),  76 },
+        { AOM_CDF4(30905, 32733, 32748),  75 },
+        { AOM_CDF4(18768, 32634, 32748),  76 },
       },
       {
-        { AOM_CDF4(26307, 32563, 32721),  76 },
-        { AOM_CDF4( 2427, 31584, 32634),  76 },
+        { AOM_CDF4(26894, 32528, 32731),  76 },
+        { AOM_CDF4( 1978, 31675, 32684),  76 },
       },
       {
-        { AOM_CDF4(19996, 30995, 32404),   1 },
-        { AOM_CDF4( 3513, 27942, 31889),   1 },
+        { AOM_CDF4(20750, 31222, 32412),   1 },
+        { AOM_CDF4( 3259, 28753, 32073),   1 },
       },
       {
-        { AOM_CDF4(10612, 24825, 29989),  75 },
-        { AOM_CDF4( 1047, 19492, 28275),   1 },
+        { AOM_CDF4(10948, 25238, 30225),   0 },
+        { AOM_CDF4(  733, 20129, 28689),   1 },
       },
       {
-        { AOM_CDF4( 4242, 13259, 19184),   1 },
-        { AOM_CDF4( 1172,  9168, 16321),  78 },
+        { AOM_CDF4( 3995, 12602, 18654),   0 },
+        { AOM_CDF4(  997,  9216, 16560),  75 },
       },
       {
-        { AOM_CDF4(31457, 32729, 32748),  10 },
-        { AOM_CDF4(30422, 32660, 32748),  75 },
+        { AOM_CDF4(31712, 32750, 32754),  75 },
+        { AOM_CDF4(31152, 32718, 32748),  75 },
       },
       {
-        { AOM_CDF4(27779, 32641, 32736),  75 },
-        { AOM_CDF4( 5287, 31840, 32647),   3 },
+        { AOM_CDF4(28091, 32642, 32748),  75 },
+        { AOM_CDF4( 5217, 32006, 32702),  78 },
       },
       {
-        { AOM_CDF4(21913, 31552, 32527),   5 },
-        { AOM_CDF4( 2875, 29189, 32244),  75 },
+        { AOM_CDF4(22886, 31816, 32647),   0 },
+        { AOM_CDF4( 2358, 29840, 32394),  75 },
       },
       {
-        { AOM_CDF4(12313, 26713, 31050),  78 },
-        { AOM_CDF4( 1321, 21630, 29645),  78 },
+        { AOM_CDF4(13616, 27730, 31451),   0 },
+        { AOM_CDF4( 1022, 23059, 30343),   0 },
       },
       {
-        { AOM_CDF4( 5733, 16109, 22581), 118 },
-        { AOM_CDF4( 1094, 11550, 19983), 118 },
+        { AOM_CDF4( 6026, 17154, 23829),  75 },
+        { AOM_CDF4(  837, 12628, 21443),  90 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -2506,64 +2506,64 @@
     },
     {
       {
-        { AOM_CDF4(28836, 32608, 32748),  76 },
-        { AOM_CDF4(12041, 31811, 32704),  78 },
+        { AOM_CDF4(27869, 32588, 32732),   1 },
+        { AOM_CDF4(11934, 31678, 32720),  78 },
       },
       {
-        { AOM_CDF4(21729, 31640, 32585),  75 },
-        { AOM_CDF4( 1474, 29481, 32423),   0 },
+        { AOM_CDF4(20773, 31428, 32627),  75 },
+        { AOM_CDF4(  813, 29336, 32408),   0 },
       },
       {
-        { AOM_CDF4(17033, 29575, 31908),  31 },
-        { AOM_CDF4( 3501, 25200, 30759),  76 },
+        { AOM_CDF4(16679, 28979, 31835),   6 },
+        { AOM_CDF4( 2825, 24549, 30651),   1 },
       },
       {
-        { AOM_CDF4( 9052, 22321, 27988),   1 },
-        { AOM_CDF4(  192, 17125, 25929),  31 },
+        { AOM_CDF4( 8393, 21384, 27275),   1 },
+        { AOM_CDF4(   95, 15687, 24751),   6 },
       },
       {
-        { AOM_CDF4( 2920,  9043, 13114),  75 },
-        { AOM_CDF4(  553,  5873, 11221),  90 },
+        { AOM_CDF4( 3024,  8983, 13215),  75 },
+        { AOM_CDF4(  476,  5931, 11675),  90 },
       },
       {
-        { AOM_CDF4(30400, 32727, 32748),  30 },
-        { AOM_CDF4(15723, 32253, 32735),   0 },
+        { AOM_CDF4(29793, 32715, 32748),  31 },
+        { AOM_CDF4(15137, 32136, 32735),   0 },
       },
       {
-        { AOM_CDF4(23657, 31953, 32640),   1 },
-        { AOM_CDF4( 1747, 30564, 32572),  31 },
+        { AOM_CDF4(23697, 31828, 32635),   1 },
+        { AOM_CDF4( 1247, 29941, 32474),  31 },
       },
       {
-        { AOM_CDF4(17630, 29726, 31946),   6 },
-        { AOM_CDF4( 3860, 26071, 31138),   6 },
+        { AOM_CDF4(15925, 28680, 31655),   6 },
+        { AOM_CDF4( 2639, 25018, 30693),   6 },
       },
       {
-        { AOM_CDF4( 8637, 22828, 28646),  75 },
-        { AOM_CDF4( 2949, 17650, 26557),  75 },
+        { AOM_CDF4( 8039, 21380, 27690),  80 },
+        { AOM_CDF4( 2054, 16597, 25993),   0 },
       },
       {
-        { AOM_CDF4( 3507, 10250, 15354),  75 },
-        { AOM_CDF4(  316,  7273, 13420),   0 },
+        { AOM_CDF4( 3566, 10567, 15908),  90 },
+        { AOM_CDF4(  229,  7289, 14138),   1 },
       },
       {
-        { AOM_CDF4(31156, 32752, 32756),  75 },
-        { AOM_CDF4(32095, 32698, 32748),  95 },
+        { AOM_CDF4(31282, 32752, 32756),  75 },
+        { AOM_CDF4(32072, 32728, 32748),  90 },
       },
       {
-        { AOM_CDF4(26799, 32544, 32715),   0 },
-        { AOM_CDF4( 7084, 31575, 32632),  83 },
+        { AOM_CDF4(26939, 32527, 32733),  75 },
+        { AOM_CDF4( 6585, 31625, 32669),  78 },
       },
       {
-        { AOM_CDF4(20240, 31046, 32441),  78 },
-        { AOM_CDF4( 2070, 28001, 32005),  93 },
+        { AOM_CDF4(19878, 30839, 32397),  78 },
+        { AOM_CDF4( 1559, 27814, 31953),  78 },
       },
       {
-        { AOM_CDF4(11710, 25938, 30699),  93 },
-        { AOM_CDF4(  708, 20558, 29036),  93 },
+        { AOM_CDF4(11443, 25746, 30681),  78 },
+        { AOM_CDF4(  474, 20515, 28997),  78 },
       },
       {
-        { AOM_CDF4( 5423, 15197, 21637), 118 },
-        { AOM_CDF4(  496, 10569, 18629), 118 },
+        { AOM_CDF4( 5430, 15504, 22268),  93 },
+        { AOM_CDF4(  484, 11281, 19715),  93 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -2590,24 +2590,24 @@
   {
     {
       {
-        { AOM_CDF4(16326, 28983, 31911),   0 },
-        { AOM_CDF4( 7616, 27309, 32152),   5 },
+        { AOM_CDF4(16644, 29920, 32210),   0 },
+        { AOM_CDF4( 8472, 27835, 32053),   8 },
       },
       {
-        { AOM_CDF4(11910, 28533, 32025),   0 },
-        { AOM_CDF4( 1018, 24707, 31314),   0 },
+        { AOM_CDF4(12684, 27992, 31958),  15 },
+        { AOM_CDF4( 1352, 23985, 31355),   0 },
       },
       {
-        { AOM_CDF4( 7809, 21268, 28992),   0 },
-        { AOM_CDF4( 1435, 13270, 25053),  18 },
+        { AOM_CDF4( 6935, 20786, 28614),  90 },
+        { AOM_CDF4( 1491, 14175, 25464),  18 },
       },
       {
-        { AOM_CDF4( 4700, 14253, 20551),  99 },
-        { AOM_CDF4(  888,  9263, 17374),  20 },
+        { AOM_CDF4( 4284, 13084, 20147),  93 },
+        { AOM_CDF4(  506,  8831, 17788),  90 },
       },
       {
-        { AOM_CDF4( 2877,  7004, 14133),   0 },
-        { AOM_CDF4( 1725,  5605, 12360),  25 },
+        { AOM_CDF4( 2473, 16075, 19166),  90 },
+        { AOM_CDF4( 2070,  4484,  8278),  42 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -2650,20 +2650,20 @@
         { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(30989, 32644, 32658),  16 },
-        { AOM_CDF4(29010, 30211, 32249),  81 },
+        { AOM_CDF4(31137, 32587, 32685),  75 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 9968, 24258, 30431),  90 },
-        { AOM_CDF4(17080, 23752, 30728),  78 },
+        { AOM_CDF4(13651, 25517, 30395),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 8203, 19415, 25530),  75 },
-        { AOM_CDF4( 4388, 15905, 23703), 121 },
+        { AOM_CDF4( 7870, 18277, 25280),  78 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 2002,  9976, 18563),  20 },
-        { AOM_CDF4(  833,  7425, 15001), 120 },
+        { AOM_CDF4( 3433,  9986, 16852),  17 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -2672,228 +2672,228 @@
     },
     {
       {
-        { AOM_CDF4(26444, 32662, 32717),  75 },
-        { AOM_CDF4(12140, 31769, 32608),  75 },
+        { AOM_CDF4(25281, 32546, 32739),  90 },
+        { AOM_CDF4(13926, 31641, 32699),  75 },
       },
       {
-        { AOM_CDF4(19825, 31746, 32528),  90 },
-        { AOM_CDF4(  172, 28082, 32222),  75 },
+        { AOM_CDF4(19473, 31423, 32614),  90 },
+        { AOM_CDF4(   98, 28106, 32308),  90 },
       },
       {
-        { AOM_CDF4(15038, 28799, 31837),  78 },
-        { AOM_CDF4(  246, 23903, 30926),  75 },
+        { AOM_CDF4(14245, 28210, 31761),  78 },
+        { AOM_CDF4(  186, 23144, 30686),  75 },
       },
       {
-        { AOM_CDF4( 9459, 23394, 29521),  93 },
-        { AOM_CDF4(  392, 17523, 27428),  78 },
+        { AOM_CDF4( 8755, 22554, 29121),  78 },
+        { AOM_CDF4(  312, 17032, 27163),  78 },
       },
       {
-        { AOM_CDF4( 5383, 15157, 22039),  78 },
-        { AOM_CDF4(  483, 10281, 19547),  78 },
+        { AOM_CDF4( 5207, 15042, 22350),  78 },
+        { AOM_CDF4(  383, 10485, 19689),  78 },
       },
       {
-        { AOM_CDF4(27957, 32692, 32742),   0 },
-        { AOM_CDF4(16068, 32186, 32674),  15 },
+        { AOM_CDF4(27697, 32637, 32746),  90 },
+        { AOM_CDF4(19828, 32280, 32729),   0 },
       },
       {
-        { AOM_CDF4(21189, 32040, 32596),  78 },
-        { AOM_CDF4(  519, 29230, 32357),  75 },
+        { AOM_CDF4(20895, 31709, 32601),  93 },
+        { AOM_CDF4(  706, 29097, 32430),  75 },
       },
       {
-        { AOM_CDF4(15518, 29451, 32090),   3 },
-        { AOM_CDF4(  518, 24257, 31235),  75 },
+        { AOM_CDF4(14671, 28816, 32008),   3 },
+        { AOM_CDF4(  547, 23747, 31087),  75 },
       },
       {
-        { AOM_CDF4( 9479, 23708, 29840),  93 },
-        { AOM_CDF4(  356, 17554, 27711),  75 },
+        { AOM_CDF4( 8923, 23097, 29710),  93 },
+        { AOM_CDF4(  217, 17350, 27724),  75 },
       },
       {
-        { AOM_CDF4( 5200, 15798, 23717),  78 },
-        { AOM_CDF4(  317, 11756, 21578),  78 },
+        { AOM_CDF4( 5346, 16046, 24143),  78 },
+        { AOM_CDF4(  362, 12099, 22064),  78 },
       },
       {
-        { AOM_CDF4(28801, 32711, 32748),   0 },
-        { AOM_CDF4(15606, 32106, 32682),   5 },
+        { AOM_CDF4(26664, 32524, 32729),   0 },
+        { AOM_CDF4(19929, 32241, 32732),   5 },
       },
       {
-        { AOM_CDF4(20809, 32112, 32618),   3 },
-        { AOM_CDF4(  439, 29522, 32418),   0 },
+        { AOM_CDF4(20429, 31546, 32587),  78 },
+        { AOM_CDF4(  871, 29224, 32427),  75 },
       },
       {
-        { AOM_CDF4(15143, 29596, 32281),  93 },
-        { AOM_CDF4(  421, 25032, 31540),  75 },
+        { AOM_CDF4(15091, 29302, 32181),  93 },
+        { AOM_CDF4(  420, 24224, 31315),  75 },
       },
       {
-        { AOM_CDF4( 9887, 24635, 30595),  93 },
-        { AOM_CDF4(  680, 18846, 28698),  93 },
+        { AOM_CDF4( 9650, 24609, 30553),  93 },
+        { AOM_CDF4(  716, 18899, 28798),  78 },
       },
       {
-        { AOM_CDF4( 5863, 17830, 25557), 119 },
-        { AOM_CDF4(  492, 12641, 23054),  78 },
+        { AOM_CDF4( 6228, 18247, 26011),  93 },
+        { AOM_CDF4(  488, 12960, 23566),  93 },
       },
       {
-        { AOM_CDF4(29938, 32717, 32734),   0 },
-        { AOM_CDF4(31527, 32422, 32653),  90 },
+        { AOM_CDF4(31458, 32658, 32742),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(20011, 31604, 32508),  90 },
-        { AOM_CDF4( 7437, 28695, 32303),  75 },
+        { AOM_CDF4(20693, 30846, 32296),  90 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(14508, 28284, 31574),  75 },
-        { AOM_CDF4(  205, 22797, 30247),  75 },
+        { AOM_CDF4(12771, 25313, 29851),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 9692, 23077, 28850),  75 },
-        { AOM_CDF4(  250, 17402, 26850),   0 },
+        { AOM_CDF4( 7602, 19024, 25601),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 5632, 16478, 23602),  75 },
-        { AOM_CDF4(  269, 11438, 20122),  75 },
+        { AOM_CDF4( 4692, 14076, 20351),  15 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
     },
     {
       {
-        { AOM_CDF4(28336, 32677, 32744),  75 },
-        { AOM_CDF4(11298, 32165, 32677),  75 },
+        { AOM_CDF4(26646, 32618, 32748),  75 },
+        { AOM_CDF4(12985, 32023, 32728),  75 },
       },
       {
-        { AOM_CDF4(22501, 32227, 32643),  93 },
-        { AOM_CDF4(  187, 29940, 32482),   5 },
+        { AOM_CDF4(21678, 31945, 32675),  93 },
+        { AOM_CDF4(   46, 29649, 32565),   0 },
       },
       {
-        { AOM_CDF4(18859, 30771, 32385),  75 },
-        { AOM_CDF4(  827, 27322, 31931),   0 },
+        { AOM_CDF4(16813, 29938, 32304),  75 },
+        { AOM_CDF4(  734, 25488, 31518),   0 },
       },
       {
-        { AOM_CDF4(11313, 25752, 30760),  78 },
-        { AOM_CDF4(  865, 20203, 29028),  78 },
+        { AOM_CDF4(10047, 24573, 30320),  78 },
+        { AOM_CDF4(  680, 18741, 28408),  78 },
       },
       {
-        { AOM_CDF4( 5819, 16740, 23829),  75 },
-        { AOM_CDF4(  382, 11856, 20933),  78 },
+        { AOM_CDF4( 5428, 16010, 23347),  75 },
+        { AOM_CDF4(  282, 11635, 21016),  78 },
       },
       {
-        { AOM_CDF4(29494, 32716, 32748),  75 },
-        { AOM_CDF4(22811, 32563, 32726),  75 },
+        { AOM_CDF4(29492, 32711, 32748),  90 },
+        { AOM_CDF4(22856, 32581, 32748),  90 },
       },
       {
-        { AOM_CDF4(24040, 32572, 32706),  75 },
-        { AOM_CDF4(  671, 31036, 32587),  75 },
+        { AOM_CDF4(23814, 32473, 32732),  75 },
+        { AOM_CDF4(  505, 30842, 32654),  75 },
       },
       {
-        { AOM_CDF4(20384, 31538, 32546),   0 },
-        { AOM_CDF4(  520, 28431, 32214),   0 },
+        { AOM_CDF4(17970, 30664, 32542),   0 },
+        { AOM_CDF4(  591, 26988, 31983),   0 },
       },
       {
-        { AOM_CDF4(12468, 27111, 31300),  75 },
-        { AOM_CDF4(  855, 21229, 29823),  78 },
+        { AOM_CDF4(10731, 25646, 30915),  75 },
+        { AOM_CDF4(  716, 19981, 29261),  78 },
       },
       {
-        { AOM_CDF4( 6292, 18163, 25251),  75 },
-        { AOM_CDF4(  297, 12949, 22469),  90 },
+        { AOM_CDF4( 5897, 17573, 25080),  75 },
+        { AOM_CDF4(  178, 12954, 22725),  90 },
       },
       {
-        { AOM_CDF4(29956, 32739, 32748),   5 },
-        { AOM_CDF4(25511, 32678, 32747),   0 },
+        { AOM_CDF4(30940, 32740, 32748),   0 },
+        { AOM_CDF4(27493, 32693, 32748),   5 },
       },
       {
-        { AOM_CDF4(25094, 32653, 32727),  75 },
-        { AOM_CDF4( 1027, 31569, 32601),  75 },
+        { AOM_CDF4(25557, 32571, 32738),  90 },
+        { AOM_CDF4( 1156, 31536, 32692),  90 },
       },
       {
-        { AOM_CDF4(21341, 31980, 32614),  75 },
-        { AOM_CDF4( 1222, 29205, 32367),  78 },
+        { AOM_CDF4(19676, 31438, 32631),  75 },
+        { AOM_CDF4( 1853, 28395, 32266),  78 },
       },
       {
-        { AOM_CDF4(13596, 28307, 31818),  93 },
-        { AOM_CDF4(  463, 22903, 30766),  78 },
+        { AOM_CDF4(12168, 27322, 31648),  93 },
+        { AOM_CDF4(  374, 21862, 30426),  78 },
       },
       {
-        { AOM_CDF4( 7257, 20011, 27200),  78 },
-        { AOM_CDF4(  243, 14888, 24930),  75 },
+        { AOM_CDF4( 6908, 19494, 27071),  78 },
+        { AOM_CDF4(  113, 14821, 25176),  90 },
       },
       {
-        { AOM_CDF4(30263, 32752, 32756),   5 },
-        { AOM_CDF4(32687, 32691, 32736),  75 },
+        { AOM_CDF4(32313, 32737, 32748),  25 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(24209, 32619, 32710), 100 },
-        { AOM_CDF4( 5284, 31291, 32536),  90 },
+        { AOM_CDF4(23711, 32006, 32620),  75 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(19815, 31729, 32509),  75 },
-        { AOM_CDF4(  727, 27808, 32167),  78 },
+        { AOM_CDF4(16041, 28992, 31635),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(14179, 29447, 32088),  75 },
-        { AOM_CDF4(  431, 23037, 30646),  90 },
+        { AOM_CDF4( 9990, 23637, 29213),   5 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 7559, 20896, 27797),  75 },
-        { AOM_CDF4(  968, 15248, 25120),  75 },
+        { AOM_CDF4( 5762, 16053, 22500),   5 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
     },
     {
       {
-        { AOM_CDF4(28071, 32641, 32748),   1 },
-        { AOM_CDF4( 8252, 32402, 32724),   0 },
+        { AOM_CDF4(27184, 32672, 32748),   1 },
+        { AOM_CDF4(10613, 32252, 32738),  75 },
       },
       {
-        { AOM_CDF4(22806, 32096, 32661),  75 },
-        { AOM_CDF4( 1629, 30429, 32579),  80 },
+        { AOM_CDF4(22470, 32091, 32716),  75 },
+        { AOM_CDF4(  949, 30238, 32643),  80 },
       },
       {
-        { AOM_CDF4(18671, 30613, 32354),   0 },
-        { AOM_CDF4(  914, 27565, 32050),  80 },
+        { AOM_CDF4(17935, 30422, 32413),   0 },
+        { AOM_CDF4(  674, 26736, 32008),  80 },
       },
       {
-        { AOM_CDF4(11122, 25437, 30413),  90 },
-        { AOM_CDF4( 1038, 20145, 28882),  90 },
+        { AOM_CDF4(11011, 25612, 30643),  90 },
+        { AOM_CDF4(  997, 19957, 28943),  90 },
       },
       {
-        { AOM_CDF4( 4570, 12828, 18535),  75 },
-        { AOM_CDF4(  118,  9801, 17797),  76 },
+        { AOM_CDF4( 4754, 13518, 19616),  75 },
+        { AOM_CDF4(   30, 10027, 18226),  76 },
       },
       {
-        { AOM_CDF4(28991, 32683, 32748),   0 },
-        { AOM_CDF4(15477, 32477, 32734),   0 },
+        { AOM_CDF4(29734, 32729, 32748),   0 },
+        { AOM_CDF4(17868, 32552, 32748),   0 },
       },
       {
-        { AOM_CDF4(24905, 32598, 32731),   1 },
-        { AOM_CDF4(  654, 31461, 32635),  76 },
+        { AOM_CDF4(25168, 32565, 32739),  76 },
+        { AOM_CDF4(  525, 31274, 32689),  76 },
       },
       {
-        { AOM_CDF4(19448, 30956, 32442),  90 },
-        { AOM_CDF4( 1943, 27652, 31993),  75 },
+        { AOM_CDF4(19155, 30941, 32493),  75 },
+        { AOM_CDF4( 1986, 27740, 32084),  75 },
       },
       {
-        { AOM_CDF4(10931, 25186, 30249),  75 },
-        { AOM_CDF4(  324, 20290, 29116),  81 },
+        { AOM_CDF4(10959, 25516, 30465),  75 },
+        { AOM_CDF4(  233, 20155, 29122),  81 },
       },
       {
-        { AOM_CDF4( 4786, 15004, 21436),   1 },
-        { AOM_CDF4(  620, 10260, 18119),  75 },
+        { AOM_CDF4( 4681, 14503, 21334),   0 },
+        { AOM_CDF4(  483, 10679, 18885),  75 },
       },
       {
-        { AOM_CDF4(30637, 32738, 32748),   0 },
-        { AOM_CDF4(31051, 32680, 32748),  75 },
+        { AOM_CDF4(31907, 32752, 32756),   0 },
+        { AOM_CDF4(31874, 32719, 32748),  75 },
       },
       {
-        { AOM_CDF4(26531, 32666, 32740),  90 },
-        { AOM_CDF4( 3541, 31673, 32651),  93 },
+        { AOM_CDF4(26499, 32598, 32736),  90 },
+        { AOM_CDF4( 4327, 31612, 32678),  93 },
       },
       {
-        { AOM_CDF4(21778, 31813, 32600),  75 },
-        { AOM_CDF4( 1449, 29130, 32312),  93 },
+        { AOM_CDF4(20964, 31523, 32599),  75 },
+        { AOM_CDF4( 1451, 28828, 32263),  90 },
       },
       {
-        { AOM_CDF4(13573, 27879, 31575), 118 },
-        { AOM_CDF4(  512, 22769, 30465),  75 },
+        { AOM_CDF4(12822, 27283, 31369),  78 },
+        { AOM_CDF4(  336, 21868, 30060),  75 },
       },
       {
-        { AOM_CDF4( 6758, 18214, 24828), 118 },
-        { AOM_CDF4(  596, 13133, 22284),  93 },
+        { AOM_CDF4( 6252, 17633, 24699),  93 },
+        { AOM_CDF4(  465, 12979, 22414),  93 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -2918,64 +2918,64 @@
     },
     {
       {
-        { AOM_CDF4(29445, 32681, 32748),   6 },
-        { AOM_CDF4(11704, 32239, 32721),   5 },
+        { AOM_CDF4(27513, 32649, 32748),   6 },
+        { AOM_CDF4(12533, 32080, 32727),   0 },
       },
       {
-        { AOM_CDF4(23524, 32207, 32669),  80 },
-        { AOM_CDF4(  825, 30714, 32552),  15 },
+        { AOM_CDF4(22267, 31858, 32685),  80 },
+        { AOM_CDF4(  475, 29885, 32524),  15 },
       },
       {
-        { AOM_CDF4(19561, 31160, 32352),   1 },
-        { AOM_CDF4( 1954, 27112, 31684),   1 },
+        { AOM_CDF4(17673, 30194, 32223),   1 },
+        { AOM_CDF4( 1643, 25673, 31224),   1 },
       },
       {
-        { AOM_CDF4(10514, 24500, 29706),  76 },
-        { AOM_CDF4(  459, 20277, 28132),   6 },
+        { AOM_CDF4(10022, 24035, 29658),  75 },
+        { AOM_CDF4(  276, 18877, 27751),   6 },
       },
       {
-        { AOM_CDF4( 4027, 11634, 16675),  76 },
-        { AOM_CDF4(  302,  7940, 14728),  76 },
+        { AOM_CDF4( 4529, 13192, 18915),  76 },
+        { AOM_CDF4(  285,  9212, 16975),  76 },
       },
       {
-        { AOM_CDF4(30990, 32726, 32748),  76 },
-        { AOM_CDF4(13751, 32427, 32744),  15 },
+        { AOM_CDF4(29967, 32707, 32748),   6 },
+        { AOM_CDF4(15326, 32376, 32746),  15 },
       },
       {
-        { AOM_CDF4(24701, 32333, 32698),  76 },
-        { AOM_CDF4( 1865, 31436, 32660),   0 },
+        { AOM_CDF4(24351, 32244, 32717),   1 },
+        { AOM_CDF4( 1649, 31057, 32684),   0 },
       },
       {
-        { AOM_CDF4(18571, 30647, 32260),  26 },
-        { AOM_CDF4( 1470, 27002, 31702),  31 },
+        { AOM_CDF4(17832, 30408, 32381),   6 },
+        { AOM_CDF4( 1876, 26558, 31696),  31 },
       },
       {
-        { AOM_CDF4(10161, 24255, 29484),  75 },
-        { AOM_CDF4( 1106, 18944, 27931),   0 },
+        { AOM_CDF4(10499, 24843, 30081),  75 },
+        { AOM_CDF4( 1028, 19460, 28542),   1 },
       },
       {
-        { AOM_CDF4( 4526, 12987, 18916),  75 },
-        { AOM_CDF4(  190,  9362, 17078),   1 },
+        { AOM_CDF4( 5050, 14590, 21227),  75 },
+        { AOM_CDF4(   92, 10933, 19446),   6 },
       },
       {
-        { AOM_CDF4(30893, 32752, 32756),  80 },
-        { AOM_CDF4(32376, 32674, 32748),  75 },
+        { AOM_CDF4(31604, 32752, 32756),  75 },
+        { AOM_CDF4(32163, 32722, 32748),  90 },
       },
       {
-        { AOM_CDF4(26541, 32626, 32731),   5 },
-        { AOM_CDF4( 4703, 31625, 32658),  90 },
+        { AOM_CDF4(26537, 32585, 32739),  75 },
+        { AOM_CDF4( 5518, 31656, 32695),  90 },
       },
       {
-        { AOM_CDF4(20317, 31425, 32556),   0 },
-        { AOM_CDF4(  775, 28219, 32158),  83 },
+        { AOM_CDF4(20484, 31396, 32601),  75 },
+        { AOM_CDF4( 1028, 28479, 32227),  78 },
       },
       {
-        { AOM_CDF4(12426, 26935, 31266), 118 },
-        { AOM_CDF4(  416, 21790, 29983),  75 },
+        { AOM_CDF4(12807, 27291, 31420),  93 },
+        { AOM_CDF4(  469, 22186, 30263),  75 },
       },
       {
-        { AOM_CDF4( 6506, 17745, 24684),  75 },
-        { AOM_CDF4(   90, 12713, 21792),  81 },
+        { AOM_CDF4( 6722, 18261, 25292),  90 },
+        { AOM_CDF4(   57, 13631, 22880),  75 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -3002,16 +3002,12 @@
   {
     {
       {
-        { AOM_CDF4(17246, 29319, 31043),   0 },
-        { AOM_CDF4(18264, 31336, 32589),  45 },
+        { AOM_CDF4(18405, 30002, 32555),  40 },
+        { AOM_CDF4(14824, 31208, 31988),  50 },
       },
       {
-        { AOM_CDF4(16160, 31421, 32319),  25 },
-        { AOM_CDF4( 2789, 29979, 32071),  50 },
-      },
-      {
-        { AOM_CDF4(10923, 21845, 27307),   0 },
-        { AOM_CDF4(10923, 16384, 27307),   0 },
+        { AOM_CDF4(15397, 31584, 32373),  75 },
+        { AOM_CDF4( 1347, 29476, 32319),  65 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -3062,18 +3058,22 @@
         { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(30878, 31508, 32138), 100 },
-        { AOM_CDF4(29943, 31073, 32203), 100 },
-      },
-      {
-        { AOM_CDF4(22599, 30508, 31638),  25 },
-        { AOM_CDF4(24986, 30720, 32358),  50 },
-      },
-      {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
         { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
+        { AOM_CDF4(31972, 32470, 32748),  28 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
+      },
+      {
+        { AOM_CDF4(22231, 32012, 32721),  40 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
+      },
+      {
+        { AOM_CDF4( 4681, 16384, 30427),  50 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
+      },
+      {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
         { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
@@ -3084,228 +3084,228 @@
     },
     {
       {
-        { AOM_CDF4(27138, 32658, 32748),  78 },
-        { AOM_CDF4(12393, 32378, 32729),  75 },
+        { AOM_CDF4(26034, 32672, 32748),  93 },
+        { AOM_CDF4(12576, 32175, 32745),  90 },
       },
       {
-        { AOM_CDF4(22187, 32461, 32727),  93 },
-        { AOM_CDF4(  150, 30941, 32665),   0 },
+        { AOM_CDF4(22551, 32372, 32748),  93 },
+        { AOM_CDF4(   20, 30978, 32718),  15 },
       },
       {
-        { AOM_CDF4(17338, 31331, 32662),  93 },
-        { AOM_CDF4( 2202, 27719, 32467),   3 },
+        { AOM_CDF4(17805, 31280, 32648),  93 },
+        { AOM_CDF4( 1557, 28114, 32425),   3 },
       },
       {
-        { AOM_CDF4(13758, 29699, 32413),  90 },
-        { AOM_CDF4( 1079, 25405, 31906),  90 },
+        { AOM_CDF4(13292, 28676, 32147),  93 },
+        { AOM_CDF4(  555, 23489, 31233),   0 },
       },
       {
-        { AOM_CDF4(11365, 25609, 31366),  22 },
-        { AOM_CDF4( 1451, 17186, 29102),  12 },
+        { AOM_CDF4(10339, 22768, 29435),  35 },
+        { AOM_CDF4(  758, 15761, 26377),  35 },
       },
       {
-        { AOM_CDF4(29971, 32735, 32748),   0 },
-        { AOM_CDF4(13825, 32566, 32748),   3 },
+        { AOM_CDF4(29142, 32726, 32748),  15 },
+        { AOM_CDF4(17698, 32623, 32748),  25 },
       },
       {
-        { AOM_CDF4(24172, 32629, 32748),  78 },
-        { AOM_CDF4( 1297, 31983, 32725),   0 },
+        { AOM_CDF4(24984, 32622, 32748),  93 },
+        { AOM_CDF4(  600, 31789, 32745),  15 },
       },
       {
-        { AOM_CDF4(16654, 31941, 32723),  78 },
-        { AOM_CDF4( 3318, 28618, 32553),  93 },
+        { AOM_CDF4(18241, 32005, 32740),  78 },
+        { AOM_CDF4( 3053, 28834, 32573),  93 },
       },
       {
-        { AOM_CDF4(12270, 30242, 32551),   5 },
-        { AOM_CDF4(10574, 22775, 31722),  21 },
+        { AOM_CDF4(11582, 29556, 32181),  18 },
+        { AOM_CDF4( 5757, 25240, 31661),  33 },
       },
       {
-        { AOM_CDF4(10923, 22838, 30782),  50 },
-        { AOM_CDF4( 5174, 21270, 28744), 100 },
+        { AOM_CDF4( 3072, 21504, 29184),  65 },
+        { AOM_CDF4(  643, 12208, 26343),  35 },
       },
       {
-        { AOM_CDF4(31048, 32752, 32756),   3 },
-        { AOM_CDF4(22367, 32622, 32748),  18 },
+        { AOM_CDF4(29915, 32732, 32748),  78 },
+        { AOM_CDF4(24589, 32741, 32748),   0 },
       },
       {
-        { AOM_CDF4(22974, 32701, 32748),  19 },
-        { AOM_CDF4( 2681, 32393, 32748),   0 },
+        { AOM_CDF4(25072, 32653, 32747),  15 },
+        { AOM_CDF4( 2766, 32408, 32743),  78 },
       },
       {
-        { AOM_CDF4(17292, 32314, 32748),   0 },
-        { AOM_CDF4( 8144, 29399, 32623), 100 },
+        { AOM_CDF4(19064, 32047, 32688),  90 },
+        { AOM_CDF4( 6208, 29694, 32582),  75 },
       },
       {
-        { AOM_CDF4(13392, 29206, 32198),  10 },
-        { AOM_CDF4( 4725, 27586, 32158),   0 },
+        { AOM_CDF4(16118, 29137, 32325),  90 },
+        { AOM_CDF4( 3624, 26555, 32028),   6 },
       },
       {
-        { AOM_CDF4( 9830, 22938, 29491), 100 },
-        { AOM_CDF4(12288, 16384, 28672),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(31998, 32752, 32756),   0 },
-        { AOM_CDF4(32571, 32686, 32748),  75 },
+        { AOM_CDF4(32165, 32689, 32748),  75 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(19342, 32307, 32748),  75 },
-        { AOM_CDF4(18144, 30296, 32668), 100 },
+        { AOM_CDF4(20616, 31528, 32613),  78 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(15433, 30457, 32507),  19 },
-        { AOM_CDF4( 2680, 25132, 31605),  19 },
+        { AOM_CDF4(17095, 29686, 32489),  18 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(13717, 25529, 32006),   0 },
-        { AOM_CDF4( 6554, 22359, 30069),   0 },
+        { AOM_CDF4(13280, 23529, 32046),  75 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 8937, 20852, 26810), 100 },
-        { AOM_CDF4( 2979, 17873, 26810), 100 },
+        { AOM_CDF4( 1725,  3449, 31043),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
     },
     {
       {
-        { AOM_CDF4(27773, 32697, 32748),  75 },
-        { AOM_CDF4(10530, 32415, 32721),   0 },
+        { AOM_CDF4(27252, 32687, 32748),   0 },
+        { AOM_CDF4(12250, 32394, 32747),   0 },
       },
       {
-        { AOM_CDF4(22306, 32332, 32705),  93 },
-        { AOM_CDF4(  492, 30902, 32645),  75 },
+        { AOM_CDF4(22953, 32345, 32732),  93 },
+        { AOM_CDF4(  100, 31081, 32711),  75 },
       },
       {
-        { AOM_CDF4(18533, 31223, 32571),  90 },
-        { AOM_CDF4( 1465, 28239, 32330),  15 },
+        { AOM_CDF4(18289, 31130, 32616),  90 },
+        { AOM_CDF4( 1043, 27525, 32293),  15 },
       },
       {
-        { AOM_CDF4(11912, 27520, 31690),  78 },
-        { AOM_CDF4( 1661, 21597, 30499),  18 },
+        { AOM_CDF4(12030, 27356, 31773),  75 },
+        { AOM_CDF4( 1328, 21750, 30500),  18 },
       },
       {
-        { AOM_CDF4( 8998, 22965, 29595),  75 },
-        { AOM_CDF4(  544, 17233, 27639),  76 },
+        { AOM_CDF4( 8454, 22057, 29080),  90 },
+        { AOM_CDF4(  312, 16537, 27228),  76 },
       },
       {
-        { AOM_CDF4(29374, 32740, 32748),  75 },
-        { AOM_CDF4(25268, 32443, 32748),  78 },
+        { AOM_CDF4(29639, 32739, 32748),   0 },
+        { AOM_CDF4(24459, 32557, 32748),  78 },
       },
       {
-        { AOM_CDF4(24227, 32633, 32745),  75 },
-        { AOM_CDF4( 1308, 31731, 32699),   5 },
+        { AOM_CDF4(24256, 32629, 32748),  75 },
+        { AOM_CDF4(  586, 31663, 32726),   5 },
       },
       {
-        { AOM_CDF4(19766, 31677, 32647),   0 },
-        { AOM_CDF4( 2057, 28914, 32486),  75 },
+        { AOM_CDF4(18917, 31583, 32708),   0 },
+        { AOM_CDF4( 1616, 28584, 32470),  75 },
       },
       {
-        { AOM_CDF4(14000, 29870, 32447),  91 },
-        { AOM_CDF4( 1783, 23278, 31313),  75 },
+        { AOM_CDF4(13655, 29545, 32407),  75 },
+        { AOM_CDF4( 1396, 23860, 31469),  90 },
       },
       {
-        { AOM_CDF4( 9983, 26232, 31448),   1 },
-        { AOM_CDF4( 2513, 18611, 29499),   1 },
+        { AOM_CDF4( 9270, 24668, 30796),  91 },
+        { AOM_CDF4( 1688, 18438, 28979),  91 },
       },
       {
-        { AOM_CDF4(30685, 32748, 32752),  75 },
-        { AOM_CDF4(28900, 32694, 32748),   0 },
+        { AOM_CDF4(31096, 32751, 32755),   0 },
+        { AOM_CDF4(28942, 32716, 32748),   5 },
       },
       {
-        { AOM_CDF4(25687, 32634, 32748),  78 },
-        { AOM_CDF4(  950, 32482, 32736),  75 },
+        { AOM_CDF4(25750, 32644, 32748),  75 },
+        { AOM_CDF4(  465, 32242, 32741),  90 },
       },
       {
-        { AOM_CDF4(21265, 32494, 32735),  75 },
-        { AOM_CDF4( 3365, 30027, 32611),  75 },
+        { AOM_CDF4(20669, 32346, 32741),  90 },
+        { AOM_CDF4( 2885, 29990, 32664),  75 },
       },
       {
-        { AOM_CDF4(14858, 30623, 32606), 120 },
-        { AOM_CDF4(  614, 25899, 32225),  90 },
+        { AOM_CDF4(15748, 30594, 32632),  90 },
+        { AOM_CDF4(  372, 26420, 32273),  90 },
       },
       {
-        { AOM_CDF4(11020, 27781, 32373),   6 },
-        { AOM_CDF4( 1422, 21158, 30766),  76 },
+        { AOM_CDF4(10002, 25783, 31458),  81 },
+        { AOM_CDF4(  869, 20294, 30019),  92 },
       },
       {
-        { AOM_CDF4(31900, 32752, 32756),  78 },
-        { AOM_CDF4(32717, 32721, 32748),  83 },
+        { AOM_CDF4(32513, 32752, 32756),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(24484, 32572, 32748), 100 },
-        { AOM_CDF4(11600, 31143, 32727),  90 },
+        { AOM_CDF4(24556, 32348, 32716),  90 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(20370, 31703, 32646),   5 },
-        { AOM_CDF4( 8150, 28986, 32326),  80 },
+        { AOM_CDF4(19561, 30597, 32461),   1 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4(13954, 28407, 32020),  85 },
-        { AOM_CDF4( 3765, 28027, 31931),  10 },
+        { AOM_CDF4(11689, 27786, 31427),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
       {
-        { AOM_CDF4( 9362, 21065, 30427), 100 },
-        { AOM_CDF4( 5783, 21203, 30840), 100 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
+        { AOM_CDF4( 8192, 16384, 24576),   0 },
       },
     },
     {
       {
-        { AOM_CDF4(25137, 32689, 32748),   0 },
-        { AOM_CDF4( 6127, 32348, 32724),   0 },
+        { AOM_CDF4(26428, 32701, 32748),   5 },
+        { AOM_CDF4( 8484, 32368, 32747),   0 },
       },
       {
-        { AOM_CDF4(20809, 32284, 32699),  78 },
-        { AOM_CDF4( 1019, 29915, 32595),   5 },
+        { AOM_CDF4(22687, 32407, 32740),  75 },
+        { AOM_CDF4(  390, 30961, 32716),   5 },
       },
       {
-        { AOM_CDF4(16613, 30801, 32529),  75 },
-        { AOM_CDF4( 1173, 26024, 31985),  75 },
+        { AOM_CDF4(18394, 31398, 32670),  75 },
+        { AOM_CDF4(  853, 27383, 32300),  75 },
       },
       {
-        { AOM_CDF4(12141, 27579, 31620),  75 },
-        { AOM_CDF4( 1226, 21070, 30286), 115 },
+        { AOM_CDF4(12738, 28040, 31842),  75 },
+        { AOM_CDF4( 1044, 21941, 30518),  75 },
       },
       {
-        { AOM_CDF4( 7083, 18725, 25849),  78 },
-        { AOM_CDF4(  384, 13555, 24555),   0 },
+        { AOM_CDF4( 6990, 19000, 26174),  78 },
+        { AOM_CDF4(  118, 14015, 24791),  75 },
       },
       {
-        { AOM_CDF4(27008, 32736, 32748),   1 },
-        { AOM_CDF4(19776, 32128, 32739),  83 },
+        { AOM_CDF4(28826, 32741, 32748),  31 },
+        { AOM_CDF4(19295, 32513, 32748),   5 },
       },
       {
-        { AOM_CDF4(23453, 32635, 32747),  81 },
-        { AOM_CDF4( 3719, 31367, 32695),  80 },
+        { AOM_CDF4(24880, 32674, 32744),  76 },
+        { AOM_CDF4( 2546, 31692, 32741),  80 },
       },
       {
-        { AOM_CDF4(18497, 31026, 32515), 101 },
-        { AOM_CDF4( 1990, 28272, 32320),   6 },
+        { AOM_CDF4(19559, 31494, 32644),  76 },
+        { AOM_CDF4( 1553, 28807, 32451),  81 },
       },
       {
-        { AOM_CDF4(12323, 27014, 31453),  75 },
-        { AOM_CDF4(  922, 22322, 30653),  75 },
+        { AOM_CDF4(12667, 27705, 31740),   5 },
+        { AOM_CDF4(  706, 22624, 30721),   0 },
       },
       {
-        { AOM_CDF4( 7724, 20172, 27333),   1 },
-        { AOM_CDF4(  415, 16481, 25566),   1 },
+        { AOM_CDF4( 7658, 20890, 27914),  75 },
+        { AOM_CDF4(  423, 16424, 25634),  91 },
       },
       {
-        { AOM_CDF4(30828, 32752, 32756),  75 },
-        { AOM_CDF4(32672, 32676, 32748), 115 },
+        { AOM_CDF4(31332, 32752, 32756),   0 },
+        { AOM_CDF4(32634, 32730, 32748),  75 },
       },
       {
-        { AOM_CDF4(26418, 32658, 32748), 115 },
-        { AOM_CDF4( 7696, 32008, 32719),  93 },
+        { AOM_CDF4(26024, 32656, 32746),  75 },
+        { AOM_CDF4( 6440, 32017, 32721),  78 },
       },
       {
-        { AOM_CDF4(22808, 32248, 32688),  90 },
-        { AOM_CDF4( 3603, 30161, 32502),  90 },
+        { AOM_CDF4(21950, 32128, 32733),  90 },
+        { AOM_CDF4( 2501, 29939, 32539),  75 },
       },
       {
-        { AOM_CDF4(15554, 30362, 32398),  76 },
-        { AOM_CDF4( 1529, 24994, 31482),  93 },
+        { AOM_CDF4(15537, 30098, 32412),  75 },
+        { AOM_CDF4(  951, 25283, 31648),   3 },
       },
       {
-        { AOM_CDF4( 9693, 24090, 30054),   1 },
-        { AOM_CDF4( 2310, 18771, 29258),  76 },
+        { AOM_CDF4( 8361, 23816, 30093),  76 },
+        { AOM_CDF4( 1474, 18475, 28692),  91 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -3330,64 +3330,64 @@
     },
     {
       {
-        { AOM_CDF4(26470, 32729, 32748),   7 },
-        { AOM_CDF4(10395, 32344, 32744),   8 },
+        { AOM_CDF4(27339, 32708, 32748),  81 },
+        { AOM_CDF4(11572, 32394, 32748),   8 },
       },
       {
-        { AOM_CDF4(22143, 32489, 32734),   5 },
-        { AOM_CDF4(  990, 30444, 32617),   0 },
+        { AOM_CDF4(23878, 32548, 32744),   5 },
+        { AOM_CDF4(  461, 31124, 32705),   0 },
       },
       {
-        { AOM_CDF4(17125, 30676, 32518),  75 },
-        { AOM_CDF4(  721, 27147, 32180),  75 },
+        { AOM_CDF4(19326, 31492, 32668),  75 },
+        { AOM_CDF4(  664, 28301, 32374),  75 },
       },
       {
-        { AOM_CDF4(12046, 26628, 31217),  76 },
-        { AOM_CDF4(  684, 21586, 30135),  76 },
+        { AOM_CDF4(13120, 27541, 31646),  76 },
+        { AOM_CDF4(  550, 22504, 30562),  76 },
       },
       {
-        { AOM_CDF4( 5901, 17039, 23630),   1 },
-        { AOM_CDF4(  818, 11831, 20903),  76 },
+        { AOM_CDF4( 6365, 17893, 24908),  15 },
+        { AOM_CDF4(  608, 12570, 22302),  90 },
       },
       {
-        { AOM_CDF4(28247, 32689, 32748),  31 },
-        { AOM_CDF4(11599, 32409, 32744),   0 },
+        { AOM_CDF4(29384, 32732, 32748),   6 },
+        { AOM_CDF4(13817, 32574, 32748),   0 },
       },
       {
-        { AOM_CDF4(22247, 32322, 32721),  90 },
-        { AOM_CDF4( 2155, 31402, 32701),  31 },
+        { AOM_CDF4(24520, 32525, 32747),  76 },
+        { AOM_CDF4( 1775, 31839, 32739),   6 },
       },
       {
-        { AOM_CDF4(16573, 31360, 32594),   6 },
-        { AOM_CDF4( 3791, 27059, 32065),   6 },
+        { AOM_CDF4(19335, 31747, 32688),   6 },
+        { AOM_CDF4( 3566, 28880, 32362),   6 },
       },
       {
-        { AOM_CDF4(10980, 26048, 30979),   1 },
-        { AOM_CDF4(  636, 20748, 29525),   1 },
+        { AOM_CDF4(12397, 27427, 31587),   1 },
+        { AOM_CDF4(  509, 22594, 30553),   0 },
       },
       {
-        { AOM_CDF4( 6843, 18269, 25436),   0 },
-        { AOM_CDF4(  899, 13081, 23222),  76 },
+        { AOM_CDF4( 7148, 19219, 26315),  75 },
+        { AOM_CDF4(  677, 13710, 23764),  76 },
       },
       {
-        { AOM_CDF4(30221, 32752, 32756),  80 },
-        { AOM_CDF4(32594, 32617, 32748), 100 },
+        { AOM_CDF4(31236, 32752, 32756),  80 },
+        { AOM_CDF4(32618, 32731, 32748),  90 },
       },
       {
-        { AOM_CDF4(25278, 32628, 32748),  75 },
-        { AOM_CDF4( 5271, 31614, 32692), 115 },
+        { AOM_CDF4(27068, 32675, 32748),  75 },
+        { AOM_CDF4( 5945, 32111, 32744),  90 },
       },
       {
-        { AOM_CDF4(20384, 31949, 32664),  75 },
-        { AOM_CDF4( 2212, 29000, 32396),  75 },
+        { AOM_CDF4(22852, 32207, 32731),  75 },
+        { AOM_CDF4( 2177, 30282, 32570),  75 },
       },
       {
-        { AOM_CDF4(12723, 28024, 31879),  75 },
-        { AOM_CDF4( 3021, 23271, 31033),  75 },
+        { AOM_CDF4(14481, 29134, 32134),   0 },
+        { AOM_CDF4( 2589, 24920, 31424),   0 },
       },
       {
-        { AOM_CDF4( 8230, 22265, 28399),  75 },
-        { AOM_CDF4(  415, 16233, 26412),   0 },
+        { AOM_CDF4( 8171, 21620, 28271),  75 },
+        { AOM_CDF4(  169, 16674, 26696),  75 },
       },
       {
         { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -3416,198 +3416,198 @@
 static const aom_cdf_prob av1_default_coeff_base_multi_uv_cdfs[4][12][2][CDF_SIZE(4)] = {
   {
     {
-      { AOM_CDF4(26007, 32241, 32639),   0 },
-      { AOM_CDF4(26007, 32241, 32639),   0 },
+      { AOM_CDF4(26904, 32102, 32598),   0 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(17365, 29572, 31911),  90 },
-      { AOM_CDF4(17365, 29572, 31911),  90 },
+      { AOM_CDF4(15749, 28898, 31610),  90 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 8543, 21075, 27313),  75 },
-      { AOM_CDF4( 8543, 21075, 27313),  75 },
+      { AOM_CDF4( 9106, 21329, 26962),  90 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 4393, 12441, 18915),  76 },
-      { AOM_CDF4( 4393, 12441, 18915),  76 },
+      { AOM_CDF4( 4828, 12923, 18983),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(26852, 32428, 32678),  75 },
-      { AOM_CDF4(26852, 32428, 32678),  75 },
+      { AOM_CDF4(27779, 32406, 32689),  90 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(18225, 30513, 32242), 120 },
-      { AOM_CDF4(18225, 30513, 32242), 120 },
+      { AOM_CDF4(17414, 30077, 32025),  90 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 9602, 22923, 28632),  75 },
-      { AOM_CDF4( 9602, 22923, 28632),  75 },
+      { AOM_CDF4( 9228, 22296, 27767),  81 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 4728, 13291, 19961),  15 },
-      { AOM_CDF4( 4728, 13291, 19961),  15 },
+      { AOM_CDF4( 4564, 12734, 19144),  90 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(28239, 32612, 32732), 105 },
-      { AOM_CDF4(28239, 32612, 32732), 105 },
+      { AOM_CDF4(29238, 32489, 32693),  80 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(21777, 31920, 32593),  75 },
-      { AOM_CDF4(21777, 31920, 32593),  75 },
+      { AOM_CDF4(19819, 30853, 32222),  25 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(10167, 22287, 27755),  20 },
-      { AOM_CDF4(10167, 22287, 27755),  20 },
+      { AOM_CDF4( 9314, 19318, 25346),   6 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 3763, 10274, 17843),  84 },
-      { AOM_CDF4( 3763, 10274, 17843),  84 },
+      { AOM_CDF4( 3060, 10265, 16088),   5 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
   },
   {
     {
-      { AOM_CDF4(26071, 32361, 32667),  75 },
-      { AOM_CDF4(26071, 32361, 32667),  75 },
+      { AOM_CDF4(26264, 32282, 32667),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(16124, 29499, 31947),  75 },
-      { AOM_CDF4(16124, 29499, 31947),  75 },
+      { AOM_CDF4(16468, 29532, 31912),  78 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 8857, 21690, 27718),  75 },
-      { AOM_CDF4( 8857, 21690, 27718),  75 },
+      { AOM_CDF4( 8915, 21647, 27531),   0 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 4563, 12848, 19240),  75 },
-      { AOM_CDF4( 4563, 12848, 19240),  75 },
+      { AOM_CDF4( 4341, 12415, 18782),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(27210, 32509, 32703),   0 },
-      { AOM_CDF4(27210, 32509, 32703),   0 },
+      { AOM_CDF4(27171, 32473, 32714),  90 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(17974, 30478, 32206),  75 },
-      { AOM_CDF4(17974, 30478, 32206),  75 },
+      { AOM_CDF4(18547, 30679, 32297),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 9325, 22310, 28033),  75 },
-      { AOM_CDF4( 9325, 22310, 28033),  75 },
+      { AOM_CDF4( 9723, 23037, 28561),   0 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 4214, 11861, 18089),  75 },
-      { AOM_CDF4( 4214, 11861, 18089),  75 },
+      { AOM_CDF4( 4310, 12399, 18745),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(28512, 32439, 32684),  75 },
-      { AOM_CDF4(28512, 32439, 32684),  75 },
+      { AOM_CDF4(29747, 32607, 32733),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(19918, 30794, 32233),  90 },
-      { AOM_CDF4(19918, 30794, 32233),  90 },
+      { AOM_CDF4(21347, 31575, 32509),  90 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 8545, 20451, 26400),   5 },
-      { AOM_CDF4( 8545, 20451, 26400),   5 },
+      { AOM_CDF4(10548, 22298, 28335),  80 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 3297, 10809, 17416),  96 },
-      { AOM_CDF4( 3297, 10809, 17416),  96 },
+      { AOM_CDF4( 2124,  9709, 17598),  90 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
   },
   {
     {
-      { AOM_CDF4(26847, 32431, 32693),  75 },
-      { AOM_CDF4(26847, 32431, 32693),  75 },
+      { AOM_CDF4(26928, 32457, 32720),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(16626, 29898, 32086),  75 },
-      { AOM_CDF4(16626, 29898, 32086),  75 },
+      { AOM_CDF4(16472, 30015, 32195),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 9575, 22628, 28255),  75 },
-      { AOM_CDF4( 9575, 22628, 28255),  75 },
+      { AOM_CDF4( 9599, 22905, 28625),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 4790, 13131, 19545),  76 },
-      { AOM_CDF4( 4790, 13131, 19545),  76 },
+      { AOM_CDF4( 4866, 13616, 20435),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(26405, 32274, 32665),  75 },
-      { AOM_CDF4(26405, 32274, 32665),  75 },
+      { AOM_CDF4(27711, 32490, 32726),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(15958, 29449, 31888),  75 },
-      { AOM_CDF4(15958, 29449, 31888),  75 },
+      { AOM_CDF4(16379, 30167, 32197),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 9027, 21837, 27644),   1 },
-      { AOM_CDF4( 9027, 21837, 27644),   1 },
+      { AOM_CDF4( 9085, 22146, 28034),   1 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 4555, 12639, 18997),   1 },
-      { AOM_CDF4( 4555, 12639, 18997),   1 },
+      { AOM_CDF4( 3893, 11359, 17565),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(29803, 32664, 32748),  75 },
-      { AOM_CDF4(29803, 32664, 32748),  75 },
+      { AOM_CDF4(30658, 32684, 32748),  90 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(21668, 31797, 32594), 115 },
-      { AOM_CDF4(21668, 31797, 32594), 115 },
+      { AOM_CDF4(22171, 31876, 32636),  90 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(10619, 23941, 29332),  76 },
-      { AOM_CDF4(10619, 23941, 29332),  76 },
+      { AOM_CDF4(10726, 23535, 29193),  17 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 3730,  9857, 15718), 100 },
-      { AOM_CDF4( 3730,  9857, 15718), 100 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
   },
   {
     {
-      { AOM_CDF4(26525, 32419, 32724),  75 },
-      { AOM_CDF4(26525, 32419, 32724),  75 },
+      { AOM_CDF4(26130, 32392, 32726),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(13626, 29583, 32261),  75 },
-      { AOM_CDF4(13626, 29583, 32261),  75 },
+      { AOM_CDF4(13730, 29626, 32253),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 9014, 23415, 29326),   7 },
-      { AOM_CDF4( 9014, 23415, 29326),   7 },
+      { AOM_CDF4( 9442, 23537, 29252),   6 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 5308, 16384, 23590),  75 },
-      { AOM_CDF4( 5308, 16384, 23590),  75 },
+      { AOM_CDF4( 4255, 13986, 21188),  35 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(25016, 32329, 32719),  75 },
-      { AOM_CDF4(25016, 32329, 32719),  75 },
+      { AOM_CDF4(24285, 32033, 32659),   0 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(14001, 29360, 32145),  75 },
-      { AOM_CDF4(14001, 29360, 32145),  75 },
+      { AOM_CDF4(11954, 28100, 31763),  75 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 8594, 22169, 28754),   9 },
-      { AOM_CDF4( 8594, 22169, 28754),   9 },
+      { AOM_CDF4( 7399, 19439, 26435),   5 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 5179, 14375, 22253),  95 },
-      { AOM_CDF4( 5179, 14375, 22253),  95 },
+      { AOM_CDF4( 4096, 12081, 19339),  77 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(30742, 32620, 32719), 110 },
-      { AOM_CDF4(30742, 32620, 32719), 110 },
+      { AOM_CDF4(30583, 31894, 32331),  90 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(24363, 31917, 32449),   0 },
-      { AOM_CDF4(24363, 31917, 32449),   0 },
+      { AOM_CDF4(18905, 31508, 32138),  25 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(12288, 24576, 28672),   0 },
-      { AOM_CDF4(12288, 24576, 28672),   0 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -3620,490 +3620,490 @@
   {
     {
       {
-        { AOM_CDF6( 7282, 10923, 18204, 23666, 29127),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1955, 18697, 24078, 28839, 30736),  44 },
-        { AOM_CDF6(    6,  9227, 22263, 28518, 30557),  98 },
+        { AOM_CDF6( 1828, 16851, 24012, 28649, 30422),  43 },
+        { AOM_CDF6(    4,  8171, 22012, 28211, 30477),  78 },
       },
       {
-        { AOM_CDF6( 7835, 16968, 21861, 27114, 29363),   4 },
-        { AOM_CDF6(    9,  6957, 16088, 22518, 28393),  84 },
+        { AOM_CDF6( 6923, 16016, 21706, 27149, 29436),   3 },
+        { AOM_CDF6(    4,  7404, 16572, 22804, 28278),  83 },
       },
       {
-        { AOM_CDF6( 5157,  8164, 14904, 19714, 23273),  92 },
-        { AOM_CDF6(    8,  4732, 13020, 18204, 22882),   2 },
+        { AOM_CDF6( 5490,  8820, 15814, 20244, 24021),  92 },
+        { AOM_CDF6(    4,  5052, 13398, 18782, 23391),   2 },
       },
       {
-        { AOM_CDF6( 2795,  6758, 11364, 16087, 20674),  23 },
-        { AOM_CDF6(   10,  3902,  8690, 11447, 16125),  20 },
+        { AOM_CDF6( 3032,  8030, 13087, 17462, 21741),   0 },
+        { AOM_CDF6(    4,  4819, 10626, 13564, 18007),  16 },
       },
       {
-        { AOM_CDF6( 1928,  5512,  7680, 10087, 13715),  78 },
-        { AOM_CDF6(   11,  3119,  8236, 10667, 11844),  97 },
+        { AOM_CDF6( 2261,  6418,  9159, 11973, 15591),  78 },
+        { AOM_CDF6(    5,  3913,  9731, 12580, 13840),  92 },
       },
       {
-        { AOM_CDF6( 2035,  4686,  7775, 10757, 14165),  94 },
-        { AOM_CDF6(   12,  2403,  5388,  7838, 10348),  95 },
+        { AOM_CDF6( 2300,  5287,  8547, 12143, 15837),  90 },
+        { AOM_CDF6(    5,  2607,  6044,  8929, 11979),  90 },
       },
       {
-        { AOM_CDF6( 1322,  4348,  7063,  9827, 10565),  18 },
-        { AOM_CDF6(  151,  1274,  3058,  5560,  8247),  16 },
+        { AOM_CDF6( 1698,  5197,  8275, 11449, 12212),  18 },
+        { AOM_CDF6(   49,  2125,  4169,  7345, 10592),   0 },
       },
       {
-        { AOM_CDF6(  643,  2439,  3414,  4877,  5919),  99 },
-        { AOM_CDF6( 1138,  1142,  2734,  3730,  4758), 115 },
+        { AOM_CDF6(  588,  2906,  4192,  5998,  7090),  93 },
+        { AOM_CDF6( 1289,  1297,  3318,  4626,  5829),  93 },
       },
       {
-        { AOM_CDF6(10990, 28116, 30763, 31404, 32126), 104 },
-        { AOM_CDF6( 7068, 26746, 32023, 32528, 32716),  75 },
+        { AOM_CDF6(12754, 29010, 31539, 32136, 32523),  75 },
+        { AOM_CDF6( 5740, 26647, 31969, 32459, 32732),  10 },
       },
       {
-        { AOM_CDF6( 8845, 25337, 30248, 31904, 32397), 124 },
-        { AOM_CDF6(   15, 20627, 29234, 31931, 32502),  91 },
+        { AOM_CDF6( 7974, 23312, 28743, 31187, 32129),  78 },
+        { AOM_CDF6(    4, 19122, 28115, 31351, 32328),  90 },
       },
       {
-        { AOM_CDF6( 6411, 18962, 26813, 29869, 31359),  78 },
-        { AOM_CDF6(   23, 12346, 22225, 27510, 30164),   0 },
+        { AOM_CDF6( 6004, 17753, 25489, 28906, 30692),  78 },
+        { AOM_CDF6(    4, 11476, 20286, 25973, 29118),   0 },
       },
       {
-        { AOM_CDF6( 5081, 13090, 21074, 26248, 29384), 123 },
-        { AOM_CDF6(   82,  8726, 16175, 23036, 27738),  95 },
+        { AOM_CDF6( 5318, 12906, 20831, 25848, 28911),  93 },
+        { AOM_CDF6(    4,  8395, 15889, 22378, 27016),  90 },
       },
       {
-        { AOM_CDF6( 3117,  9688, 15836, 21005, 24720),  94 },
-        { AOM_CDF6(   11,  6210, 13037, 18966, 23068),  78 },
+        { AOM_CDF6( 3337, 10161, 16413, 20903, 24729),  93 },
+        { AOM_CDF6(    4,  6231, 13179, 19032, 23124),  78 },
       },
       {
-        { AOM_CDF6( 2506,  7911, 13032, 18068, 22090), 118 },
-        { AOM_CDF6(   84,  5350, 10419, 15440, 19527),  90 },
+        { AOM_CDF6( 2632,  8256, 13389, 18349, 22057),  93 },
+        { AOM_CDF6(    4,  5539, 10753, 15541, 19671),  90 },
       },
       {
-        { AOM_CDF6( 1616,  4740,  7525, 10555, 12671), 103 },
-        { AOM_CDF6(  287,  2686,  5588,  8468, 11146), 103 },
+        { AOM_CDF6( 1647,  4981,  8018, 10713, 12930),  78 },
+        { AOM_CDF6(  133,  2595,  5758,  9172, 12046),  78 },
       },
       {
-        { AOM_CDF6(17804, 30182, 32030, 32529, 32621), 118 },
-        { AOM_CDF6( 7337, 28224, 32292, 32536, 32671),  98 },
+        { AOM_CDF6(17458, 29871, 32000, 32546, 32702),  93 },
+        { AOM_CDF6( 6925, 27088, 31750, 32368, 32706),  93 },
       },
       {
-        { AOM_CDF6(10697, 24858, 29738, 31486, 32180), 123 },
-        { AOM_CDF6( 1550, 18695, 27807, 31024, 31954), 120 },
+        { AOM_CDF6(10512, 24503, 29646, 31529, 32218),  93 },
+        { AOM_CDF6(  862, 17944, 27174, 30714, 32074),  90 },
       },
       {
-        { AOM_CDF6( 6541, 17579, 24225, 28482, 30506), 123 },
-        { AOM_CDF6( 1302, 11607, 20979, 26303, 29208), 115 },
+        { AOM_CDF6( 6509, 17436, 24062, 28298, 30439),  93 },
+        { AOM_CDF6(  730, 11602, 20450, 26039, 29031),  90 },
       },
       {
-        { AOM_CDF6( 4016, 12357, 19149, 24303, 27411), 115 },
-        { AOM_CDF6( 1211,  8231, 16090, 22155, 26456), 118 },
+        { AOM_CDF6( 4334, 12843, 19639, 24807, 27809),  90 },
+        { AOM_CDF6( 1182,  8304, 16062, 22058, 26408),  93 },
       },
       {
-        { AOM_CDF6( 2484,  7270, 11890, 15920, 19658), 123 },
-        { AOM_CDF6(  805,  5094,  9946, 14452, 18092), 123 },
+        { AOM_CDF6( 2763,  7942, 12551, 16873, 20575),  93 },
+        { AOM_CDF6(  588,  5113, 10255, 14725, 18439),  93 },
       },
       {
-        { AOM_CDF6(18832, 29501, 31412, 32019, 32234),   5 },
-        { AOM_CDF6(18832, 29501, 31412, 32019, 32234),   5 },
-      },
-      {
-        { AOM_CDF6(12192, 25324, 29644, 31121, 31692),  90 },
-        { AOM_CDF6(12192, 25324, 29644, 31121, 31692),  90 },
-      },
-      {
-        { AOM_CDF6( 7297, 18053, 24620, 28179, 29856),  75 },
-        { AOM_CDF6( 7297, 18053, 24620, 28179, 29856),  75 },
-      },
-      {
-        { AOM_CDF6( 6351, 14261, 20044, 23900, 26371),  75 },
-        { AOM_CDF6( 6351, 14261, 20044, 23900, 26371),  75 },
-      },
-      {
-        { AOM_CDF6( 3044,  8507, 13554, 17700, 20847),  75 },
-        { AOM_CDF6( 3044,  8507, 13554, 17700, 20847),  75 },
-      },
-      {
-        { AOM_CDF6( 2125,  5665,  9347, 12830, 15909), 100 },
-        { AOM_CDF6( 2125,  5665,  9347, 12830, 15909), 100 },
-      },
-      {
-        { AOM_CDF6( 1310,  3647,  6103,  8479, 10724), 124 },
-        { AOM_CDF6( 1310,  3647,  6103,  8479, 10724), 124 },
-      },
-      {
-        { AOM_CDF6(24974, 32003, 32552, 32665, 32700),   0 },
-        { AOM_CDF6(24974, 32003, 32552, 32665, 32700),   0 },
-      },
-      {
-        { AOM_CDF6(14816, 26797, 30763, 31884, 32258),  90 },
-        { AOM_CDF6(14816, 26797, 30763, 31884, 32258),  90 },
-      },
-      {
-        { AOM_CDF6( 7599, 17322, 23806, 27634, 29698),  75 },
-        { AOM_CDF6( 7599, 17322, 23806, 27634, 29698),  75 },
-      },
-      {
-        { AOM_CDF6( 7103, 14637, 20025, 23706, 26319),  90 },
-        { AOM_CDF6( 7103, 14637, 20025, 23706, 26319),  90 },
-      },
-      {
-        { AOM_CDF6( 2520,  6946, 11110, 14689, 17772),  93 },
-        { AOM_CDF6( 2520,  6946, 11110, 14689, 17772),  93 },
-      },
-    },
-    {
-      {
-        { AOM_CDF6( 3674, 28376, 30234, 31079, 31881),  31 },
-        { AOM_CDF6( 4681,  9362, 18725, 23406, 28087),   0 },
-      },
-      {
-        { AOM_CDF6( 4218, 19173, 28003, 30478, 32201),  18 },
-        { AOM_CDF6(    4,  9148, 20819, 27374, 30428),  78 },
-      },
-      {
-        { AOM_CDF6(13420, 23080, 27194, 29702, 31274),  76 },
-        { AOM_CDF6(    4, 10769, 22591, 26946, 28756),   0 },
-      },
-      {
-        { AOM_CDF6( 5988, 13144, 19557, 24128, 26546),  76 },
-        { AOM_CDF6(    4,  5437, 13509, 19391, 23435),  80 },
-      },
-      {
-        { AOM_CDF6( 2722,  8736, 12093, 16578, 20511),   1 },
-        { AOM_CDF6(    4,  5311, 11403, 16009, 19376),  93 },
-      },
-      {
-        { AOM_CDF6( 2209,  7039, 11042, 14142, 16420),  75 },
-        { AOM_CDF6(    4,  4341,  7785, 12565, 16556), 124 },
-      },
-      {
-        { AOM_CDF6(  903,  4080,  8196, 10264, 13828),  96 },
-        { AOM_CDF6( 2380,  2396,  6345,  9136, 12272),  95 },
-      },
-      {
-        { AOM_CDF6( 1026,  4730,  7747, 10065, 12225),  75 },
-        { AOM_CDF6(    4,  3608,  5373,  7862, 10619),  79 },
-      },
-      {
-        { AOM_CDF6(  418,  2529,  3772,  5111,  6595), 123 },
-        { AOM_CDF6( 1332,  1336,  2811,  4603,  6006),  98 },
-      },
-      {
-        { AOM_CDF6(18029, 31174, 32628, 32640, 32679),  80 },
-        { AOM_CDF6(18190, 27990, 32080, 32651, 32732), 104 },
-      },
-      {
-        { AOM_CDF6(14619, 28632, 31831, 32398, 32631),  18 },
-        { AOM_CDF6(   10, 24392, 30550, 32214, 32579),  80 },
-      },
-      {
-        { AOM_CDF6(12651, 25180, 29580, 31542, 32302),  75 },
-        { AOM_CDF6(   19, 19007, 27434, 30532, 31670),  90 },
-      },
-      {
-        { AOM_CDF6( 6287, 17882, 24305, 28365, 30348),  93 },
-        { AOM_CDF6(   44, 12345, 21056, 26679, 29581), 118 },
-      },
-      {
-        { AOM_CDF6( 4267, 12266, 18835, 23840, 27226), 123 },
-        { AOM_CDF6(    9,  7954, 15525, 21492, 25443),  90 },
-      },
-      {
-        { AOM_CDF6( 3266, 10180, 15955, 20692, 24207),  75 },
-        { AOM_CDF6(  235,  5498, 11616, 17368, 21778),  79 },
-      },
-      {
-        { AOM_CDF6( 1920,  5749,  9013, 12069, 14299), 103 },
-        { AOM_CDF6(  100,  3140,  6771, 10152, 13109),  78 },
-      },
-      {
-        { AOM_CDF6(25232, 32327, 32622, 32735, 32739), 103 },
-        { AOM_CDF6( 9286, 31105, 32603, 32734, 32738),  90 },
-      },
-      {
-        { AOM_CDF6(17625, 30012, 32144, 32560, 32624), 118 },
-        { AOM_CDF6(  157, 26669, 31834, 32538, 32613),  75 },
-      },
-      {
-        { AOM_CDF6(12336, 26106, 30658, 32091, 32450), 115 },
-        { AOM_CDF6(  205, 20658, 28929, 31522, 32265), 100 },
-      },
-      {
-        { AOM_CDF6( 7103, 18979, 26355, 29947, 31502), 118 },
-        { AOM_CDF6(  519, 14086, 23524, 28447, 30906),  93 },
-      },
-      {
-        { AOM_CDF6( 3275,  9601, 15013, 19461, 22814),  93 },
-        { AOM_CDF6(  405,  6336, 12573, 17560, 21302),  90 },
-      },
-      {
-        { AOM_CDF6(26290, 32021, 32468, 32597, 32646),   0 },
-        { AOM_CDF6(26290, 32021, 32468, 32597, 32646),   0 },
-      },
-      {
-        { AOM_CDF6(16555, 29135, 31552, 32191, 32400),  90 },
-        { AOM_CDF6(16555, 29135, 31552, 32191, 32400),  90 },
-      },
-      {
-        { AOM_CDF6(10084, 22847, 28258, 30456, 31389),  75 },
-        { AOM_CDF6(10084, 22847, 28258, 30456, 31389),  75 },
-      },
-      {
-        { AOM_CDF6( 6977, 16792, 22984, 26486, 28437),   1 },
-        { AOM_CDF6( 6977, 16792, 22984, 26486, 28437),   1 },
-      },
-      {
-        { AOM_CDF6( 4056, 11507, 17511, 21910, 24827),  75 },
-        { AOM_CDF6( 4056, 11507, 17511, 21910, 24827),  75 },
-      },
-      {
-        { AOM_CDF6( 2994,  8463, 13359, 17473, 20660),  90 },
-        { AOM_CDF6( 2994,  8463, 13359, 17473, 20660),  90 },
-      },
-      {
-        { AOM_CDF6( 1685,  4842,  8021, 10948, 13523),  93 },
-        { AOM_CDF6( 1685,  4842,  8021, 10948, 13523),  93 },
-      },
-      {
-        { AOM_CDF6(28016, 32504, 32702, 32736, 32740),   0 },
-        { AOM_CDF6(28016, 32504, 32702, 32736, 32740),   0 },
-      },
-      {
-        { AOM_CDF6(18602, 30203, 32140, 32521, 32633), 103 },
-        { AOM_CDF6(18602, 30203, 32140, 32521, 32633), 103 },
-      },
-      {
-        { AOM_CDF6(11272, 24591, 29571, 31334, 31982),  75 },
-        { AOM_CDF6(11272, 24591, 29571, 31334, 31982),  75 },
-      },
-      {
-        { AOM_CDF6( 8093, 19452, 25731, 28891, 30469),  75 },
-        { AOM_CDF6( 8093, 19452, 25731, 28891, 30469),  75 },
-      },
-      {
-        { AOM_CDF6( 4041, 11262, 17038, 21210, 24054),  75 },
-        { AOM_CDF6( 4041, 11262, 17038, 21210, 24054),  75 },
-      },
-    },
-    {
-      {
-        { AOM_CDF6(15215, 28295, 31182, 31952, 32227),  31 },
+        { AOM_CDF6(25261, 30274, 31401, 31859, 32108),   5 },
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2502, 25172, 28818, 31401, 31613),   0 },
-        { AOM_CDF6(    5,  7352, 22161, 27439, 30861),  75 },
+        { AOM_CDF6(11341, 22787, 27330, 29329, 30402),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 9307, 21264, 26430, 29284, 30850),  80 },
-        { AOM_CDF6(    4, 14958, 24306, 29325, 29918),  25 },
+        { AOM_CDF6( 7870, 16597, 22314, 26036, 27646),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 5074, 12161, 17676, 23252, 26183),  20 },
-        { AOM_CDF6(    4,  6186, 14065, 19988, 23883),  90 },
+        { AOM_CDF6( 9102, 15212, 19596, 22630, 24714),   5 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2175,  7267, 11231, 15741, 18805), 120 },
-        { AOM_CDF6(    5,  4803, 10396, 13620, 18558),  90 },
+        { AOM_CDF6( 2627,  7584, 12537, 16148, 19228),  78 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1378,  5756, 10363, 13119, 16083),  15 },
-        { AOM_CDF6( 3232,  3289,  6479, 10657, 13939), 115 },
+        { AOM_CDF6( 1773,  5159,  8384, 11582, 14326),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1251,  4859,  7421, 11080, 12888), 115 },
-        { AOM_CDF6(    9,  3044,  6277,  9195, 11552),  75 },
+        { AOM_CDF6( 1281,  3306,  5564,  7730, 10025),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2037,  3829,  6244,  9131, 11854), 118 },
-        { AOM_CDF6(   10,  2174,  5919,  7661, 10248), 120 },
+        { AOM_CDF6(28275, 32087, 32554, 32679, 32732),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(  616,  1994,  3264,  4556,  5808),   0 },
-        { AOM_CDF6(    4,  1476,  2889,  4727,  5675),  93 },
+        { AOM_CDF6(13124, 24281, 29249, 31039, 31932),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(28513, 32606, 32717, 32736, 32740),   0 },
-        { AOM_CDF6(22586, 29480, 32095, 32634, 32732),  78 },
+        { AOM_CDF6( 7252, 15503, 21990, 26021, 28329),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(16528, 28513, 31318, 32332, 32621),  93 },
-        { AOM_CDF6(    6, 25278, 31129, 32475, 32536),   1 },
+        { AOM_CDF6( 6766, 13251, 18520, 22234, 24944),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(15476, 27147, 30597, 31886, 32347),  75 },
-        { AOM_CDF6(    4, 24085, 30024, 31588, 32211),   1 },
-      },
-      {
-        { AOM_CDF6( 6360, 17104, 23709, 27776, 29780),  78 },
-        { AOM_CDF6(   51, 14017, 22559, 27207, 29739),  18 },
-      },
-      {
-        { AOM_CDF6( 3389, 11324, 18471, 23526, 27122),  80 },
-        { AOM_CDF6(   92,  8494, 15658, 20530, 24456), 100 },
-      },
-      {
-        { AOM_CDF6( 3355,  9739, 15158, 19770, 23421),  90 },
-        { AOM_CDF6(  186,  6187, 12550, 17514, 21104),   0 },
-      },
-      {
-        { AOM_CDF6( 1419,  4731,  7906, 11060, 13556), 123 },
-        { AOM_CDF6(  115,  3565,  6660,  9709, 12459),  98 },
-      },
-      {
-        { AOM_CDF6(28957, 32607, 32740, 32744, 32748), 108 },
-        { AOM_CDF6( 8712, 31404, 32675, 32736, 32740),  95 },
-      },
-      {
-        { AOM_CDF6(22698, 31491, 32506, 32682, 32719),  93 },
-        { AOM_CDF6(  726, 29031, 32119, 32598, 32718),  15 },
-      },
-      {
-        { AOM_CDF6(18134, 29812, 32029, 32607, 32670),  75 },
-        { AOM_CDF6(  703, 25979, 31114, 32274, 32561),  90 },
-      },
-      {
-        { AOM_CDF6( 9071, 21913, 28115, 30916, 32011), 118 },
-        { AOM_CDF6(  543, 17308, 26110, 30078, 31789),  75 },
-      },
-      {
-        { AOM_CDF6( 3003,  9500, 14783, 18864, 22122),  93 },
-        { AOM_CDF6(  929,  6621, 12508, 17355, 20822),  78 },
-      },
-      {
-        { AOM_CDF6(29917, 32597, 32714, 32736, 32740),  75 },
-        { AOM_CDF6(29917, 32597, 32714, 32736, 32740),  75 },
-      },
-      {
-        { AOM_CDF6(19705, 30884, 32225, 32522, 32634),  75 },
-        { AOM_CDF6(19705, 30884, 32225, 32522, 32634),  75 },
-      },
-      {
-        { AOM_CDF6(11771, 25242, 29797, 31373, 32032),   6 },
-        { AOM_CDF6(11771, 25242, 29797, 31373, 32032),   6 },
-      },
-      {
-        { AOM_CDF6( 7884, 18463, 24730, 28017, 29624),  31 },
-        { AOM_CDF6( 7884, 18463, 24730, 28017, 29624),  31 },
-      },
-      {
-        { AOM_CDF6( 4570, 13155, 19787, 24244, 27010),  46 },
-        { AOM_CDF6( 4570, 13155, 19787, 24244, 27010),  46 },
-      },
-      {
-        { AOM_CDF6( 3458, 10299, 16096, 20513, 23626),   9 },
-        { AOM_CDF6( 3458, 10299, 16096, 20513, 23626),   9 },
-      },
-      {
-        { AOM_CDF6( 2441,  6850, 11016, 14883, 17913),  22 },
-        { AOM_CDF6( 2441,  6850, 11016, 14883, 17913),  22 },
-      },
-      {
-        { AOM_CDF6(30912, 32721, 32740, 32744, 32748),  85 },
-        { AOM_CDF6(30912, 32721, 32740, 32744, 32748),  85 },
-      },
-      {
-        { AOM_CDF6(22569, 31800, 32564, 32703, 32732),  75 },
-        { AOM_CDF6(22569, 31800, 32564, 32703, 32732),  75 },
-      },
-      {
-        { AOM_CDF6(13855, 27736, 31221, 32193, 32506),   5 },
-        { AOM_CDF6(13855, 27736, 31221, 32193, 32506),   5 },
-      },
-      {
-        { AOM_CDF6( 8984, 21588, 28059, 30514, 31533),  84 },
-        { AOM_CDF6( 8984, 21588, 28059, 30514, 31533),  84 },
-      },
-      {
-        { AOM_CDF6( 4850, 13293, 20179, 24556, 27375), 116 },
-        { AOM_CDF6( 4850, 13293, 20179, 24556, 27375), 116 },
+        { AOM_CDF6( 2022,  6282, 10559, 13831, 16913),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
     },
     {
       {
-        { AOM_CDF6(10142, 17164, 20675, 27307, 30427),  50 },
-        { AOM_CDF6( 4681,  9362, 14043, 18725, 28087),   0 },
+        { AOM_CDF6( 8794, 30831, 31512, 32035, 32245),  60 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(   61, 11168, 17059, 28657, 32707),  50 },
-        { AOM_CDF6(   28,  1249, 19727, 26442, 29882),  76 },
+        { AOM_CDF6( 4155, 20109, 27969, 30536, 32143),   0 },
+        { AOM_CDF6(    4, 10300, 22300, 28132, 30839),  75 },
       },
       {
-        { AOM_CDF6( 2644, 10879, 17814, 24793, 28607),  29 },
-        { AOM_CDF6( 4217,  5131, 15546, 17324, 20016),  22 },
+        { AOM_CDF6(13302, 23761, 27348, 29952, 31476),   1 },
+        { AOM_CDF6(    4, 14590, 24086, 28071, 29718),   1 },
       },
       {
-        { AOM_CDF6( 2223,  7049, 14034, 18416, 21020),  20 },
-        { AOM_CDF6(  335,  7639, 10186, 12263, 19366),  90 },
+        { AOM_CDF6( 6132, 14425, 20760, 25122, 27553),  76 },
+        { AOM_CDF6(    4,  7592, 16048, 21694, 25655),  81 },
       },
       {
-        { AOM_CDF6( 2535,  4037,  8920, 12300, 14271),  99 },
-        { AOM_CDF6(   99,  3762,  8613, 10791, 14850),  10 },
+        { AOM_CDF6( 3376, 10282, 14415, 19084, 23156),   1 },
+        { AOM_CDF6(    4,  5986, 12540, 17467, 21046),  75 },
       },
       {
-        { AOM_CDF6( 3678,  7468,  9920, 11368, 14489), 110 },
-        { AOM_CDF6(  687,  2062,  4354,  7447, 11572),   5 },
+        { AOM_CDF6( 2339,  7935, 12252, 15518, 18022),  75 },
+        { AOM_CDF6(    4,  4807,  8560, 13742, 17846),  93 },
       },
       {
-        { AOM_CDF6( 1408,  4480,  5632, 10880, 11776),  20 },
-        { AOM_CDF6( 1096,  2071,  4994,  8405, 10476), 122 },
+        { AOM_CDF6( 1008,  5061,  9267, 11938, 15655),  91 },
+        { AOM_CDF6( 2687,  2712,  6941, 10360, 13721),  90 },
       },
       {
-        { AOM_CDF6( 1842,  3948,  5790,  7633,  9870), 122 },
-        { AOM_CDF6(  405,  1753,  4989,  7012,  9439),  20 },
+        { AOM_CDF6( 1067,  5070,  8639, 11287, 13789),  75 },
+        { AOM_CDF6(    4,  3968,  5983,  9072, 11954),  93 },
       },
       {
-        { AOM_CDF6(  871,  2062,  3666,  5362,  5637),  77 },
-        { AOM_CDF6(   50,  1464,  2323,  2524,  4494), 102 },
+        { AOM_CDF6(  513,  3188,  4940,  6642,  8326),  93 },
+        { AOM_CDF6( 1598,  1604,  3335,  5390,  7186),  93 },
       },
       {
-        { AOM_CDF6(20249, 28740, 30264, 32441, 32659),  31 },
-        { AOM_CDF6(11690, 23981, 31016, 32292, 32618),   1 },
+        { AOM_CDF6(18364, 30931, 32563, 32686, 32732),  78 },
+        { AOM_CDF6(20105, 28028, 32148, 32696, 32722),  76 },
       },
       {
-        { AOM_CDF6(12989, 26034, 30598, 31838, 32064),  29 },
-        { AOM_CDF6(   28, 25187, 30578, 32403, 32628),  47 },
+        { AOM_CDF6(14335, 27700, 31502, 32326, 32673),  18 },
+        { AOM_CDF6(    4, 23820, 30576, 32277, 32675),  75 },
       },
       {
-        { AOM_CDF6( 6901, 20787, 26916, 30007, 31719),  32 },
-        { AOM_CDF6( 5092, 17400, 25761, 28400, 29895),  76 },
+        { AOM_CDF6(13107, 25752, 29932, 31638, 32381),  75 },
+        { AOM_CDF6(    4, 19582, 27260, 30379, 31695),  90 },
       },
       {
-        { AOM_CDF6( 2531, 16487, 22130, 27022, 28629),  26 },
-        { AOM_CDF6( 4149, 10372, 16414, 21074, 25132),  24 },
+        { AOM_CDF6( 6458, 17966, 24490, 28327, 30455),  93 },
+        { AOM_CDF6(    4, 12996, 21614, 26979, 29871),  78 },
       },
       {
-        { AOM_CDF6( 2382, 10112, 16384, 19641, 22899),  79 },
-        { AOM_CDF6(  390,  6281, 12611, 17480, 20936), 104 },
+        { AOM_CDF6( 4362, 12372, 18835, 23784, 27252),  93 },
+        { AOM_CDF6(    4,  8398, 15799, 21724, 25631),  90 },
       },
       {
-        { AOM_CDF6(  678,  8616, 13976, 17978, 20081),  17 },
-        { AOM_CDF6( 4274,  6910, 11255, 16455, 18877),  23 },
+        { AOM_CDF6( 3430, 10462, 16282, 20919, 24340),  75 },
+        { AOM_CDF6(   30,  6110, 12299, 17850, 22504),  75 },
       },
       {
-        { AOM_CDF6( 1502,  3808,  6999,  9251, 10377),  91 },
-        { AOM_CDF6(   26,  2813,  5183,  7945, 11409), 101 },
+        { AOM_CDF6( 1926,  5825,  9243, 12462, 15052),  78 },
+        { AOM_CDF6(   72,  3367,  7142, 10595, 13743),  78 },
       },
       {
-        { AOM_CDF6(27035, 32250, 32646, 32736, 32740),   1 },
-        { AOM_CDF6(11097, 31220, 32609, 32734, 32738),  90 },
+        { AOM_CDF6(24383, 32129, 32637, 32713, 32732),  93 },
+        { AOM_CDF6( 9137, 30561, 32521, 32699, 32732),  90 },
       },
       {
-        { AOM_CDF6(17752, 29769, 32185, 32669, 32732), 115 },
-        { AOM_CDF6( 3856, 27026, 32053, 32579, 32677),  15 },
+        { AOM_CDF6(17270, 29740, 32008, 32483, 32655),  93 },
+        { AOM_CDF6(    8, 25977, 31428, 32465, 32657),  75 },
       },
       {
-        { AOM_CDF6(12754, 26650, 30781, 32132, 32617),  80 },
-        { AOM_CDF6( 1600, 21246, 28993, 31136, 32124),  75 },
+        { AOM_CDF6(12268, 25877, 30422, 31961, 32485),  90 },
+        { AOM_CDF6(   12, 20569, 28767, 31457, 32359),  90 },
       },
       {
-        { AOM_CDF6( 6728, 19533, 26420, 29925, 31212), 118 },
-        { AOM_CDF6(  351, 14070, 23538, 28291, 30423), 103 },
+        { AOM_CDF6( 7294, 18995, 26081, 29672, 31452),  93 },
+        { AOM_CDF6(  181, 14139, 23494, 28458, 30918),  93 },
       },
       {
-        { AOM_CDF6( 3011,  9025, 14586, 18554, 21656),  76 },
-        { AOM_CDF6(   78,  5651, 10946, 15012, 17956),   6 },
+        { AOM_CDF6( 3440,  9808, 15386, 19904, 23390),  93 },
+        { AOM_CDF6(  139,  6455, 12703, 17797, 21832),  90 },
+      },
+      {
+        { AOM_CDF6(28752, 31869, 32320, 32478, 32572),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6(15670, 27564, 30368, 31493, 31993),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6( 9799, 20178, 25558, 28413, 30046),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6( 9356, 16500, 21207, 24352, 26419),   6 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6( 2981,  9131, 14182, 18343, 21454),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6( 2154,  6775, 11531, 15084, 18264),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6( 1257,  3940,  6890,  9699, 12030),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6(30668, 32581, 32693, 32736, 32740),   5 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6(18504, 29402, 31702, 32283, 32519),  78 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6(10766, 22532, 27978, 30115, 31262),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6( 8719, 18462, 24428, 27561, 29580),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6( 3879, 10481, 15972, 19633, 22761),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+    },
+    {
+      {
+        { AOM_CDF6(18644, 30427, 32255, 32544, 32664),  37 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6( 4549, 25234, 29518, 31595, 31998),   1 },
+        { AOM_CDF6(    4, 12584, 25285, 29517, 31566),  76 },
+      },
+      {
+        { AOM_CDF6(12259, 24561, 28578, 30638, 31755),  80 },
+        { AOM_CDF6(    4, 18211, 26628, 30288, 31028),  25 },
+      },
+      {
+        { AOM_CDF6( 5548, 13583, 19991, 25062, 27790),  15 },
+        { AOM_CDF6(    4,  8981, 17065, 22847, 26409),  75 },
+      },
+      {
+        { AOM_CDF6( 2511,  8771, 13709, 18515, 21631),  90 },
+        { AOM_CDF6(    4,  6091, 12402, 16401, 21384),  75 },
+      },
+      {
+        { AOM_CDF6( 1456,  6940, 12018, 15507, 18576),  15 },
+        { AOM_CDF6( 3828,  4004,  7860, 12305, 16184),  91 },
+      },
+      {
+        { AOM_CDF6( 1456,  5488,  8386, 12251, 14583),  90 },
+        { AOM_CDF6(    5,  3667,  7540, 10600, 13938),  75 },
+      },
+      {
+        { AOM_CDF6( 2172,  4278,  6935, 10386, 13380),  93 },
+        { AOM_CDF6(    6,  2661,  6993,  9316, 12044),  90 },
+      },
+      {
+        { AOM_CDF6(  854,  2756,  4422,  6402,  8143),  75 },
+        { AOM_CDF6(    4,  1978,  3940,  6072,  7460),  93 },
+      },
+      {
+        { AOM_CDF6(27597, 32474, 32665, 32730, 32734),  16 },
+        { AOM_CDF6(24628, 29500, 31920, 32665, 32732),   2 },
+      },
+      {
+        { AOM_CDF6(16858, 28844, 31500, 32377, 32690),  90 },
+        { AOM_CDF6(    4, 27050, 31611, 32598, 32708),   1 },
+      },
+      {
+        { AOM_CDF6(17412, 28372, 31092, 32127, 32538),  75 },
+        { AOM_CDF6(    4, 23035, 29401, 31561, 32362),   1 },
+      },
+      {
+        { AOM_CDF6( 6754, 18144, 24912, 28603, 30596),  75 },
+        { AOM_CDF6(    4, 15859, 24392, 28503, 30570),   0 },
+      },
+      {
+        { AOM_CDF6( 4015, 12511, 19603, 24562, 27900),  80 },
+        { AOM_CDF6(    4,  9194, 17016, 22337, 26137),  75 },
+      },
+      {
+        { AOM_CDF6( 3458, 10380, 16144, 21113, 24683),  90 },
+        { AOM_CDF6(    5,  6767, 13223, 18657, 22519),  15 },
+      },
+      {
+        { AOM_CDF6( 1682,  5432,  8769, 12173, 14844),  93 },
+        { AOM_CDF6(    7,  3903,  7423, 10655, 13533),  93 },
+      },
+      {
+        { AOM_CDF6(28336, 32620, 32715, 32736, 32740),  80 },
+        { AOM_CDF6( 9058, 31414, 32677, 32736, 32740),   0 },
+      },
+      {
+        { AOM_CDF6(23033, 31648, 32521, 32700, 32732),  75 },
+        { AOM_CDF6(   75, 29218, 32255, 32646, 32732),   0 },
+      },
+      {
+        { AOM_CDF6(17992, 29745, 32048, 32579, 32724),  75 },
+        { AOM_CDF6(   95, 26324, 31408, 32426, 32663),  90 },
+      },
+      {
+        { AOM_CDF6( 9671, 22972, 28881, 31303, 32233),  93 },
+        { AOM_CDF6(  132, 18991, 27475, 30900, 32140),  75 },
+      },
+      {
+        { AOM_CDF6( 3245, 10146, 15682, 20055, 23306),  90 },
+        { AOM_CDF6(  715,  6956, 13155, 18158, 21881),  78 },
+      },
+      {
+        { AOM_CDF6(30282, 32463, 32643, 32689, 32720),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6(18363, 29970, 31740, 32329, 32529),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6(11103, 21929, 26883, 29338, 30615),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6(10010, 15981, 20125, 22717, 24545),  26 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6( 2197,  6613, 12544, 16341, 19413),  32 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6(  977,  5129,  8874, 12334, 16079),  15 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6( 1326,  3745,  5773,  7906, 10325),  35 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6(31687, 32702, 32738, 32742, 32746),   5 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6(23101, 31425, 32294, 32485, 32560),  76 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6(14043, 26486, 29937, 30917, 31636),   6 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6(11590, 21553, 26089, 28623, 29781),  32 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6( 3345,  9687, 15060, 19237, 21946),  33 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+    },
+    {
+      {
+        { AOM_CDF6(17981, 30263, 31343, 31835, 32228),  52 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      },
+      {
+        { AOM_CDF6(  541, 19909, 25694, 31571, 32707),  56 },
+        { AOM_CDF6(    5,  3008, 18509, 26661, 30500),   6 },
+      },
+      {
+        { AOM_CDF6( 6280, 16644, 22197, 27386, 30311),  31 },
+        { AOM_CDF6( 3289,  9702, 18719, 20867, 24166),  42 },
+      },
+      {
+        { AOM_CDF6( 2433,  8354, 15330, 20115, 23238),   2 },
+        { AOM_CDF6(   21,  9300, 13157, 16064, 22107),   7 },
+      },
+      {
+        { AOM_CDF6( 3059,  5529, 10689, 14670, 16660),  87 },
+        { AOM_CDF6(   36,  4415,  9690, 12203, 15756),  10 },
+      },
+      {
+        { AOM_CDF6( 2528,  7188, 10559, 12046, 15715),  90 },
+        { AOM_CDF6(  228,  1917,  4701,  8762, 12870),  17 },
+      },
+      {
+        { AOM_CDF6( 1318,  4984,  6874, 11801, 12832),  85 },
+        { AOM_CDF6(  772,  1543,  4630,  8014, 10032),  90 },
+      },
+      {
+        { AOM_CDF6( 1741,  4692,  6205,  8476, 10822),  85 },
+        { AOM_CDF6(  287,  1649,  4446,  6812,  8891),  10 },
+      },
+      {
+        { AOM_CDF6(  819,  2068,  3940,  5617,  6164),  93 },
+        { AOM_CDF6(   20,  1444,  2749,  3441,  5300),  92 },
+      },
+      {
+        { AOM_CDF6(22627, 30107, 31954, 32695, 32732),   6 },
+        { AOM_CDF6( 9634, 23470, 31648, 32544, 32656),  40 },
+      },
+      {
+        { AOM_CDF6(14808, 27300, 31048, 32355, 32547),  31 },
+        { AOM_CDF6(    4, 26706, 31394, 32590, 32717),  16 },
+      },
+      {
+        { AOM_CDF6(14111, 25840, 29676, 31196, 32100),   2 },
+        { AOM_CDF6( 2240, 18421, 26730, 29569, 30965),   5 },
+      },
+      {
+        { AOM_CDF6( 3320, 16652, 23243, 27800, 29610),   6 },
+        { AOM_CDF6( 3241, 11944, 18304, 22700, 26752),   3 },
+      },
+      {
+        { AOM_CDF6( 2775, 10402, 16795, 21420, 24155),  82 },
+        { AOM_CDF6(   42,  7547, 13763, 18308, 22325),  83 },
+      },
+      {
+        { AOM_CDF6( 1526,  9483, 15296, 20232, 22733),   7 },
+        { AOM_CDF6( 3770,  6135, 11174, 17138, 20531),  93 },
+      },
+      {
+        { AOM_CDF6( 1566,  4208,  7493,  9981, 11307),  75 },
+        { AOM_CDF6(   10,  2707,  5347,  8016, 11209),  91 },
+      },
+      {
+        { AOM_CDF6(29051, 32611, 32732, 32736, 32740),  81 },
+        { AOM_CDF6(11740, 31606, 32673, 32736, 32740),  15 },
+      },
+      {
+        { AOM_CDF6(23082, 31405, 32517, 32736, 32740),  15 },
+        { AOM_CDF6( 1955, 29285, 32394, 32685, 32732),  15 },
+      },
+      {
+        { AOM_CDF6(16727, 28474, 31461, 32407, 32710),  75 },
+        { AOM_CDF6( 1043, 24584, 30321, 31899, 32456),  75 },
+      },
+      {
+        { AOM_CDF6( 7685, 20689, 27553, 30514, 31627),  90 },
+        { AOM_CDF6(  312, 15641, 24900, 29282, 31344),  78 },
+      },
+      {
+        { AOM_CDF6( 2935,  8636, 13745, 17661, 20515),  76 },
+        { AOM_CDF6(   22,  6005, 11121, 15180, 18215),  81 },
       },
       {
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
@@ -4156,88 +4156,88 @@
     },
     {
       {
-        { AOM_CDF6( 9362, 14043, 18725, 23406, 28087),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2185,  4369,  8738, 15292, 21845), 100 },
-        { AOM_CDF6( 1130,  3390,  9039, 13559, 21469),  50 },
+        { AOM_CDF6(  607,  3034,  7889, 15777, 23666),  75 },
+        { AOM_CDF6(  546,  1092,  5461,  8738, 19661),  75 },
       },
       {
-        { AOM_CDF6( 2185,  6554, 13107, 14199, 18569), 100 },
-        { AOM_CDF6( 3449,  5174,  6899, 10348, 27594), 100 },
+        { AOM_CDF6(  482,  9638, 11083, 11565, 13493),  75 },
+        { AOM_CDF6(  840,  2101,  3781, 12603, 16384),  50 },
       },
       {
-        { AOM_CDF6( 1365,  4096,  5461, 10923, 16384),  50 },
-        { AOM_CDF6( 1560,  4681,  7802, 15604, 20285),  50 },
+        { AOM_CDF6(  273,  7646,  7919, 10377, 13653),  50 },
+        { AOM_CDF6(  390,   975,  1560, 11703, 15409),  50 },
       },
       {
-        { AOM_CDF6( 1560,  3121,  4681,  7802, 15604),  50 },
-        { AOM_CDF6( 1130,  2260,  4520,  7910, 11299),  50 },
+        { AOM_CDF6(  819,  1365,  2185,  5734,  6554),  50 },
+        { AOM_CDF6(  356,   534,   890,  1603,  7480),  50 },
       },
       {
-        { AOM_CDF6( 1928,  2891,  5783,  7710,  8674),  50 },
-        { AOM_CDF6( 1311,  2621,  5243, 14418, 19661),  50 },
+        { AOM_CDF6(  426,  2128,  4256,  5532,  6383),  50 },
+        { AOM_CDF6(  226,   452,  1130,  3390,  4520),  50 },
       },
       {
-        { AOM_CDF6(  780,  1560,  3901,  4681,  7022),  50 },
-        { AOM_CDF6( 2341,  3511,  4681,  5851,  7022),  50 },
+        { AOM_CDF6(  936,  2185,  3433,  4057,  5305),   0 },
+        { AOM_CDF6(  213,   426,   851,  1702,  1915),  50 },
       },
       {
-        { AOM_CDF6( 1820,  7282, 12743, 16384, 20025), 100 },
-        { AOM_CDF6( 1425,  2849,  4274,  7123,  8548),  50 },
+        { AOM_CDF6( 1130,  6780, 11299, 13559, 15819),   0 },
+        { AOM_CDF6(  840,  1260,  1680,  2521,  3361),  50 },
       },
       {
-        { AOM_CDF6(  449,  1347,  2244,  3142,  4040), 110 },
-        { AOM_CDF6(  482,   964,  1928,  2891,  3373),  75 },
+        { AOM_CDF6(  840,  2521,  2941,  3781,  6722),  75 },
+        { AOM_CDF6(  607,   910,  1820,  2427,  2731),  25 },
       },
       {
-        { AOM_CDF6(  936,  4681, 10299, 17788, 22469),   0 },
-        { AOM_CDF6( 4428, 12842, 21255, 24355, 28783),   0 },
+        { AOM_CDF6( 2760,  9884, 19144, 26446, 28761),  75 },
+        { AOM_CDF6( 6378,  8797, 14295, 25731, 30349),  50 },
       },
       {
-        { AOM_CDF6( 4498,  9638, 12208, 14778, 19275),  25 },
-        { AOM_CDF6( 2553,  5532, 10639, 14895, 22555),  25 },
+        { AOM_CDF6( 1022,  5182, 10071, 14523, 20142),  10 },
+        { AOM_CDF6( 1625,  5578, 14671, 19283, 23851),  40 },
       },
       {
-        { AOM_CDF6( 3332, 12774, 14440, 17772, 19994),  25 },
-        { AOM_CDF6( 1092,  6554, 10923, 14199, 16930),   0 },
+        { AOM_CDF6( 1493, 14043, 16621, 19742, 20896),  40 },
+        { AOM_CDF6(   79,  5792, 10632, 14519, 17217),  75 },
       },
       {
-        { AOM_CDF6( 2458, 11469, 15565, 19661, 23757),  50 },
-        { AOM_CDF6( 1638,  4915,  7373, 10650, 13107),  25 },
+        { AOM_CDF6( 1896,  5958, 11645, 14353, 16249),   0 },
+        { AOM_CDF6(  973,  3244,  6164,  8111, 11031),   0 },
       },
       {
-        { AOM_CDF6( 3511,  8192, 14043, 17554, 19895),  50 },
-        { AOM_CDF6( 2185,  4369,  6554, 12015, 17476), 100 },
+        { AOM_CDF6( 2777,  4999,  8331, 10552, 13329),  75 },
+        { AOM_CDF6(  799,  2398,  5195,  7593, 11189),  25 },
       },
       {
-        { AOM_CDF6( 2979,  8937, 10426, 13405, 17873),  25 },
-        { AOM_CDF6( 1311,  5243,  9175, 13107, 19661),  50 },
+        { AOM_CDF6( 1771,  5314,  8856, 12399, 15056),  75 },
+        { AOM_CDF6( 2048,  6144, 14336, 16384, 18432),  50 },
       },
       {
-        { AOM_CDF6( 1040,  2601,  4941,  6242,  8062),  20 },
-        { AOM_CDF6(  756,  2269,  5293,  5797,  9074), 110 },
+        { AOM_CDF6(  509,  3735,  7980, 10017, 11715),  75 },
+        { AOM_CDF6(  537,  2149,  5551,  6088,  8416),  75 },
       },
       {
-        { AOM_CDF6(25353, 31333, 32050, 32290, 32529),  70 },
-        { AOM_CDF6(11726, 28110, 32125, 32447, 32607),  14 },
+        { AOM_CDF6(24857, 32089, 32690, 32716, 32732),   0 },
+        { AOM_CDF6(10411, 28445, 32559, 32722, 32732),  18 },
       },
       {
-        { AOM_CDF6(12393, 28987, 31298, 32348, 32558),  40 },
-        { AOM_CDF6( 7393, 27373, 30171, 31769, 32568),  10 },
+        { AOM_CDF6(15845, 30289, 32552, 32660, 32732),  40 },
+        { AOM_CDF6( 7773, 29346, 31862, 32519, 32732),  40 },
       },
       {
-        { AOM_CDF6( 7378, 21484, 26258, 29730, 31900),  85 },
-        { AOM_CDF6(  723, 21444, 28913, 31563, 32286),  10 },
+        { AOM_CDF6( 9766, 24287, 28720, 30969, 32382),  82 },
+        { AOM_CDF6(  585, 20320, 29044, 32023, 32449),  28 },
       },
       {
-        { AOM_CDF6( 4930, 16239, 20879, 27548, 29868),  20 },
-        { AOM_CDF6( 1977, 13277, 24011, 27401, 29378),   5 },
+        { AOM_CDF6( 7627, 18644, 24717, 29519, 31779),   0 },
+        { AOM_CDF6( 2718, 15100, 26426, 29748, 31560),   0 },
       },
       {
-        { AOM_CDF6( 2690,  9292, 13287, 17036, 19481),  34 },
-        { AOM_CDF6(  246,  4024,  8130, 12155, 14700),  19 },
+        { AOM_CDF6( 2451,  8257, 11869, 16556, 19523),  12 },
+        { AOM_CDF6(  256,  4651, 10581, 13824, 16341),  92 },
       },
       {
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
@@ -4292,490 +4292,490 @@
   {
     {
       {
-        { AOM_CDF6( 2947, 18388, 21099, 27700, 31825),   2 },
+        { AOM_CDF6( 2114, 21141, 25369, 30654, 32239),  15 },
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(  756, 15008, 23273, 29032, 30285),  88 },
-        { AOM_CDF6(    4,  7259, 20599, 27428, 30600),   1 },
+        { AOM_CDF6(  549, 13587, 23108, 28767, 30410),  10 },
+        { AOM_CDF6(    4,  5842, 19871, 26925, 30302),   1 },
       },
       {
-        { AOM_CDF6( 4695, 13169, 20868, 24921, 28311),   8 },
-        { AOM_CDF6(    4,  9798, 16603, 22587, 26476),   1 },
+        { AOM_CDF6( 4153, 12881, 20886, 25152, 28465),   5 },
+        { AOM_CDF6(    4,  9887, 17074, 23240, 26922),   1 },
       },
       {
-        { AOM_CDF6( 3221,  9129, 14448, 19583, 24130),   4 },
-        { AOM_CDF6(    4,  4501, 11838, 17403, 21164),   1 },
+        { AOM_CDF6( 3509,  9661, 15222, 20437, 24828),   3 },
+        { AOM_CDF6(    4,  5559, 13171, 19109, 22949),   1 },
       },
       {
-        { AOM_CDF6( 2791,  7158, 10806, 14341, 17984),  19 },
-        { AOM_CDF6(    4,  4423,  8397, 13102, 17087),  91 },
+        { AOM_CDF6( 2887,  7713, 11843, 15697, 19332),  18 },
+        { AOM_CDF6(    4,  5122,  9599, 14742, 18968),  76 },
       },
       {
-        { AOM_CDF6( 2685,  5673,  9265, 11927, 14846),  19 },
-        { AOM_CDF6(    4,  2421,  6144,  9109, 12397),  19 },
+        { AOM_CDF6( 2828,  6215, 10303, 13224, 16380),  18 },
+        { AOM_CDF6(    4,  2931,  7161, 10506, 14230),  18 },
       },
       {
-        { AOM_CDF6( 1450,  4907,  7311,  9891, 11822),  23 },
-        { AOM_CDF6(    4,  1467,  3132,  5890,  7666),  22 },
+        { AOM_CDF6( 1614,  5662,  8479, 11366, 13422),  18 },
+        { AOM_CDF6(    4,  1770,  4011,  7227,  9349),  17 },
       },
       {
-        { AOM_CDF6( 1135,  3330,  5373,  7739,  9743),  84 },
-        { AOM_CDF6(    4,  2325,  3989,  6202,  8184),  94 },
+        { AOM_CDF6( 1307,  3944,  6304,  9227, 11645),  83 },
+        { AOM_CDF6(    4,  2665,  4779,  7323,  9602),  93 },
       },
       {
-        { AOM_CDF6(  892,  2071,  3006,  3984,  4800),  78 },
-        { AOM_CDF6(   95,   884,  1687,  3182,  4291),  75 },
+        { AOM_CDF6( 1058,  2942,  4397,  5803,  6862),  78 },
+        { AOM_CDF6(    8,  1344,  2527,  4536,  6155),  78 },
       },
       {
-        { AOM_CDF6(12403, 25476, 30103, 31427, 31884),  30 },
-        { AOM_CDF6( 5167, 24213, 31202, 32123, 32463),  76 },
+        { AOM_CDF6(13961, 27727, 31548, 32432, 32640),  30 },
+        { AOM_CDF6( 2708, 23637, 31303, 32335, 32585),   1 },
       },
       {
-        { AOM_CDF6( 9196, 22862, 28575, 31046, 31934),  90 },
-        { AOM_CDF6(   73, 15774, 25750, 30059, 31553),  15 },
+        { AOM_CDF6( 8468, 21640, 27998, 30901, 32015),  90 },
+        { AOM_CDF6(    4, 16662, 26837, 30837, 32112),  90 },
       },
       {
-        { AOM_CDF6( 6375, 16967, 24241, 28011, 30154),  90 },
-        { AOM_CDF6(    4, 12430, 21155, 26323, 29811),   5 },
+        { AOM_CDF6( 6388, 17049, 24419, 28383, 30593),  90 },
+        { AOM_CDF6(    4, 12537, 21264, 26680, 30075),   5 },
       },
       {
-        { AOM_CDF6( 4535, 12980, 20317, 25184, 28292),  78 },
-        { AOM_CDF6(    4,  8915, 15813, 21574, 25751),   0 },
+        { AOM_CDF6( 4692, 13240, 20421, 25309, 28482),  78 },
+        { AOM_CDF6(    4,  9230, 16499, 22332, 26503),   0 },
       },
       {
-        { AOM_CDF6( 3419,  9878, 15651, 20421, 23868),   0 },
-        { AOM_CDF6(    4,  5590, 11934, 17096, 21448),  90 },
+        { AOM_CDF6( 3442, 10509, 16259, 21231, 24617),   0 },
+        { AOM_CDF6(    4,  6258, 12848, 18162, 22620),  90 },
       },
       {
-        { AOM_CDF6( 2478,  7338, 12377, 16642, 20196),  78 },
-        { AOM_CDF6(    4,  5105,  9717, 14406, 18541),  84 },
+        { AOM_CDF6( 2789,  8106, 13273, 17690, 21420),  78 },
+        { AOM_CDF6(    4,  5418, 10448, 15448, 19662),  83 },
       },
       {
-        { AOM_CDF6( 1478,  3950,  6445,  9101, 11093),  93 },
-        { AOM_CDF6(  195,  2542,  5339,  7707, 10228),   4 },
+        { AOM_CDF6( 1801,  4801,  7786, 10991, 13154),  93 },
+        { AOM_CDF6(   25,  3162,  6409,  9255, 12072),   3 },
       },
       {
-        { AOM_CDF6(19165, 29449, 31476, 32322, 32530),   0 },
-        { AOM_CDF6( 9431, 27119, 31298, 32276, 32536),  78 },
+        { AOM_CDF6(18092, 29844, 32040, 32571, 32719),  75 },
+        { AOM_CDF6( 9164, 26106, 31175, 32321, 32602),  78 },
       },
       {
-        { AOM_CDF6(11722, 25318, 30038, 31734, 32158),  93 },
-        { AOM_CDF6(  247, 19830, 28268, 31139, 32057),  75 },
+        { AOM_CDF6(11343, 24700, 29814, 31603, 32215),  93 },
+        { AOM_CDF6(   22, 18800, 27925, 31139, 32203),  90 },
       },
       {
-        { AOM_CDF6( 7270, 18135, 25035, 28810, 30789),  78 },
-        { AOM_CDF6(  257, 12726, 22288, 27538, 30267),  75 },
+        { AOM_CDF6( 6970, 17708, 24782, 28661, 30778),  93 },
+        { AOM_CDF6(   38, 12260, 21656, 27173, 30241),  75 },
       },
       {
-        { AOM_CDF6( 4609, 13199, 19805, 24949, 28220),  78 },
-        { AOM_CDF6(  234,  8745, 16846, 22880, 26827),  78 },
+        { AOM_CDF6( 4769, 13169, 19793, 24809, 28254),  78 },
+        { AOM_CDF6(  145,  8816, 16919, 22877, 26986),  78 },
       },
       {
-        { AOM_CDF6( 2487,  7388, 11938, 16081, 19636),  79 },
-        { AOM_CDF6(  632,  4523,  9442, 13865, 17726),  78 },
+        { AOM_CDF6( 2805,  8155, 12943, 17359, 21110),  78 },
+        { AOM_CDF6(  566,  5051, 10431, 15290, 19445),  78 },
       },
       {
-        { AOM_CDF6(19957, 30881, 32093, 32401, 32499),  75 },
-        { AOM_CDF6(19957, 30881, 32093, 32401, 32499),  75 },
+        { AOM_CDF6(21153, 29831, 31499, 32049, 32276),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(13862, 27524, 30931, 31847, 32161), 118 },
-        { AOM_CDF6(13862, 27524, 30931, 31847, 32161), 118 },
+        { AOM_CDF6(11827, 24672, 29069, 30619, 31334),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 7951, 19522, 26221, 29500, 30783),  75 },
-        { AOM_CDF6( 7951, 19522, 26221, 29500, 30783),  75 },
+        { AOM_CDF6( 6970, 16794, 23049, 26961, 28915),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 6740, 15489, 21710, 25768, 27994),  75 },
-        { AOM_CDF6( 6740, 15489, 21710, 25768, 27994),  75 },
+        { AOM_CDF6( 6107, 13557, 19154, 23110, 25619),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 3517,  9766, 15604, 20263, 23629),  78 },
-        { AOM_CDF6( 3517,  9766, 15604, 20263, 23629),  78 },
+        { AOM_CDF6( 2702,  7985, 12910, 17340, 20552),  78 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2514,  6923, 11453, 15483, 18838),  90 },
-        { AOM_CDF6( 2514,  6923, 11453, 15483, 18838),  90 },
+        { AOM_CDF6( 1993,  5600,  9439, 13043, 16257),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1575,  4396,  7421, 10439, 13122), 115 },
-        { AOM_CDF6( 1575,  4396,  7421, 10439, 13122), 115 },
+        { AOM_CDF6( 1269,  3987,  6708,  9519, 11780),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(26753, 32413, 32653, 32715, 32732),  75 },
-        { AOM_CDF6(26753, 32413, 32653, 32715, 32732),  75 },
+        { AOM_CDF6(26630, 32076, 32532, 32672, 32731),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(16486, 27781, 31508, 32297, 32527),  90 },
-        { AOM_CDF6(16486, 27781, 31508, 32297, 32527),  90 },
+        { AOM_CDF6(13939, 25333, 29988, 31536, 32142),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 8468, 18731, 25262, 29033, 30854),  75 },
-        { AOM_CDF6( 8468, 18731, 25262, 29033, 30854),  75 },
+        { AOM_CDF6( 6772, 15540, 22058, 26174, 28801),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 7679, 16687, 22428, 25871, 28305),  93 },
-        { AOM_CDF6( 7679, 16687, 22428, 25871, 28305),  93 },
+        { AOM_CDF6( 5996, 13722, 19150, 22923, 25872),  78 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 3330,  9195, 14353, 18336, 21471),  78 },
-        { AOM_CDF6( 3330,  9195, 14353, 18336, 21471),  78 },
+        { AOM_CDF6( 2372,  6802, 11003, 14855, 18017),  78 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
     },
     {
       {
-        { AOM_CDF6( 7358, 29088, 29585, 31765, 32518),   0 },
-        { AOM_CDF6( 1092, 17112, 21481, 28763, 30583),  31 },
+        { AOM_CDF6(17303, 31326, 31526, 32376, 32710),  11 },
+        { AOM_CDF6(  260, 16384, 22105, 27307, 28867),  68 },
       },
       {
-        { AOM_CDF6( 1799, 16656, 25904, 30116, 31674),  78 },
-        { AOM_CDF6(    4,  7885, 20364, 27638, 30570),  75 },
+        { AOM_CDF6( 1845, 17089, 26116, 30050, 31620),  75 },
+        { AOM_CDF6(    4,  7809, 21186, 27970, 30787),  75 },
       },
       {
-        { AOM_CDF6( 8383, 19222, 25541, 28760, 30756),  15 },
-        { AOM_CDF6(    4, 13657, 23005, 27761, 29683),   1 },
+        { AOM_CDF6( 9621, 20802, 26452, 29388, 31088),   0 },
+        { AOM_CDF6(    4, 15476, 24099, 28279, 30173),   1 },
       },
       {
-        { AOM_CDF6( 5483, 13262, 19306, 24089, 27356),  75 },
-        { AOM_CDF6(    4,  7556, 15634, 21287, 25136),   0 },
+        { AOM_CDF6( 5542, 13743, 19899, 24736, 27946),  75 },
+        { AOM_CDF6(    4,  8467, 16948, 22772, 26471),   0 },
       },
       {
-        { AOM_CDF6( 3362,  9344, 13979, 18597, 22100),  75 },
-        { AOM_CDF6(    4,  5493, 10754, 15690, 19620),  18 },
+        { AOM_CDF6( 3700, 10363, 15560, 20281, 23726),  75 },
+        { AOM_CDF6(    4,  6038, 11885, 17198, 21363),  15 },
       },
       {
-        { AOM_CDF6( 2299,  6575, 10927, 14213, 17740),  99 },
-        { AOM_CDF6(    4,  4081,  8334, 12017, 15584),  79 },
+        { AOM_CDF6( 2418,  7197, 12060, 15605, 19277),  93 },
+        { AOM_CDF6(    4,  4658,  9217, 13468, 17379),  78 },
       },
       {
-        { AOM_CDF6( 1779,  5356,  7662, 10623, 13170),  91 },
-        { AOM_CDF6( 1129,  1577,  5568,  8753, 11950),  78 },
+        { AOM_CDF6( 1804,  6314,  9128, 12718, 15539),  91 },
+        { AOM_CDF6( 1372,  1648,  6025,  9656, 13223),  78 },
       },
       {
-        { AOM_CDF6( 1657,  4299,  6919,  9362, 11822),  79 },
-        { AOM_CDF6(    4,  2904,  5784,  8606, 10987),  99 },
+        { AOM_CDF6( 1735,  4846,  7989, 10786, 13487),  78 },
+        { AOM_CDF6(    4,  3323,  6453,  9627, 12335),  93 },
       },
       {
-        { AOM_CDF6(  901,  2370,  3694,  5110,  6390),  98 },
-        { AOM_CDF6(   26,  1578,  3057,  4546,  6033), 118 },
+        { AOM_CDF6( 1072,  3013,  4878,  6783,  8518),  93 },
+        { AOM_CDF6(   10,  1926,  3795,  5732,  7600),  93 },
       },
       {
-        { AOM_CDF6(18197, 30786, 32233, 32566, 32698),  15 },
-        { AOM_CDF6(18189, 25387, 31743, 32513, 32678),  78 },
+        { AOM_CDF6(18024, 30489, 32251, 32626, 32732),  90 },
+        { AOM_CDF6(19896, 24724, 31657, 32534, 32732),   5 },
       },
       {
-        { AOM_CDF6(12034, 27402, 31238, 32348, 32566),  75 },
-        { AOM_CDF6(    4, 21214, 29432, 31922, 32410),   0 },
+        { AOM_CDF6(11660, 26630, 30824, 32187, 32598),  75 },
+        { AOM_CDF6(    4, 21429, 29602, 31983, 32544),   0 },
       },
       {
-        { AOM_CDF6(12035, 24963, 29663, 31510, 32189),  15 },
-        { AOM_CDF6(    4, 20271, 28450, 31190, 31955),   1 },
+        { AOM_CDF6(12486, 24964, 29580, 31503, 32248),  15 },
+        { AOM_CDF6(    4, 19295, 27630, 30822, 31918),   1 },
       },
       {
-        { AOM_CDF6( 7438, 18411, 24999, 28700, 30554),  78 },
-        { AOM_CDF6(    4, 12986, 21973, 27016, 29803),  75 },
+        { AOM_CDF6( 6927, 17619, 24441, 28334, 30439),  78 },
+        { AOM_CDF6(    4, 12994, 22001, 27172, 29927),  75 },
       },
       {
-        { AOM_CDF6( 4527, 12638, 19078, 23936, 27116),  93 },
-        { AOM_CDF6(    4,  8342, 15837, 21424, 25160),   0 },
+        { AOM_CDF6( 4541, 12600, 19151, 24114, 27363),  93 },
+        { AOM_CDF6(    4,  8631, 16251, 21921, 25807),   0 },
       },
       {
-        { AOM_CDF6( 3334,  9604, 15301, 20048, 23474),  78 },
-        { AOM_CDF6(   29,  6249, 12338, 17343, 21532),   0 },
+        { AOM_CDF6( 3464,  9852, 15685, 20588, 24106),  78 },
+        { AOM_CDF6(    4,  6580, 12812, 18079, 22278),   0 },
       },
       {
-        { AOM_CDF6( 1715,  5203,  8419, 11452, 13920),  93 },
-        { AOM_CDF6(  278,  3139,  6396,  9529, 12406),  78 },
+        { AOM_CDF6( 2085,  5889,  9302, 12624, 15262),  93 },
+        { AOM_CDF6(   69,  3305,  6891, 10477, 13651),  78 },
       },
       {
-        { AOM_CDF6(24768, 31988, 32544, 32716, 32732),  75 },
-        { AOM_CDF6(10750, 30362, 32442, 32659, 32726),  78 },
+        { AOM_CDF6(23748, 31870, 32594, 32721, 32732),  90 },
+        { AOM_CDF6(10783, 29998, 32378, 32682, 32732),  78 },
       },
       {
-        { AOM_CDF6(17706, 30183, 32284, 32621, 32675),  75 },
-        { AOM_CDF6(  247, 26203, 31679, 32478, 32621),  75 },
+        { AOM_CDF6(17733, 30083, 32212, 32605, 32725),  75 },
+        { AOM_CDF6(  187, 25993, 31535, 32484, 32683),  75 },
       },
       {
-        { AOM_CDF6(13437, 27033, 31065, 32215, 32489),  75 },
-        { AOM_CDF6(  260, 22099, 29474, 31675, 32323),  75 },
+        { AOM_CDF6(12827, 26254, 30707, 32112, 32556),  75 },
+        { AOM_CDF6(   92, 21424, 29165, 31621, 32404),  75 },
       },
       {
-        { AOM_CDF6( 8036, 20282, 27031, 30205, 31610),  78 },
-        { AOM_CDF6(  245, 15176, 24543, 29054, 31098),  75 },
+        { AOM_CDF6( 7651, 19635, 26664, 30009, 31616),  78 },
+        { AOM_CDF6(   27, 14981, 24532, 29277, 31387),  75 },
       },
       {
-        { AOM_CDF6( 3442,  9938, 15390, 19682, 22909),  78 },
-        { AOM_CDF6(  368,  6602, 12644, 17584, 21317),   3 },
+        { AOM_CDF6( 3603, 10277, 15911, 20395, 23870),  78 },
+        { AOM_CDF6(  350,  6796, 13207, 18418, 22380),   3 },
       },
       {
-        { AOM_CDF6(27962, 32440, 32644, 32700, 32719),  75 },
-        { AOM_CDF6(27962, 32440, 32644, 32700, 32719),  75 },
+        { AOM_CDF6(28587, 32126, 32526, 32643, 32695),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(17649, 30227, 32072, 32459, 32572),  90 },
-        { AOM_CDF6(17649, 30227, 32072, 32459, 32572),  90 },
+        { AOM_CDF6(16637, 28727, 31322, 32097, 32381),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(10838, 24277, 29419, 31247, 31906),  75 },
-        { AOM_CDF6(10838, 24277, 29419, 31247, 31906),  75 },
+        { AOM_CDF6( 9765, 21318, 26832, 29587, 30810),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 7189, 17877, 24471, 27927, 29660),  75 },
-        { AOM_CDF6( 7189, 17877, 24471, 27927, 29660),  75 },
+        { AOM_CDF6( 6949, 15290, 21217, 24889, 27171),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 4369, 12444, 19031, 23624, 26498),  15 },
-        { AOM_CDF6( 4369, 12444, 19031, 23624, 26498),  15 },
+        { AOM_CDF6( 3604, 10158, 15795, 20231, 23348),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 3187,  9258, 14817, 19352, 22697),  75 },
-        { AOM_CDF6( 3187,  9258, 14817, 19352, 22697),  75 },
+        { AOM_CDF6( 2312,  7277, 11902, 16059, 19358),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2083,  5866,  9714, 13201, 16204),  90 },
-        { AOM_CDF6( 2083,  5866,  9714, 13201, 16204),  90 },
+        { AOM_CDF6( 1616,  4713,  7922, 10951, 13675),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(29243, 32638, 32734, 32738, 32742),   0 },
-        { AOM_CDF6(29243, 32638, 32734, 32738, 32742),   0 },
+        { AOM_CDF6(30272, 32591, 32703, 32736, 32740),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(19686, 30972, 32412, 32638, 32703),  75 },
-        { AOM_CDF6(19686, 30972, 32412, 32638, 32703),  75 },
+        { AOM_CDF6(19778, 30226, 32065, 32498, 32646),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(11953, 25789, 30425, 31863, 32324),  75 },
-        { AOM_CDF6(11953, 25789, 30425, 31863, 32324),  75 },
+        { AOM_CDF6(11082, 23345, 28543, 30633, 31593),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 8156, 20260, 26854, 29902, 31236),  75 },
-        { AOM_CDF6( 8156, 20260, 26854, 29902, 31236),  75 },
+        { AOM_CDF6( 7718, 18010, 24057, 27609, 29598),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 4774, 13186, 19753, 24154, 26962),  75 },
-        { AOM_CDF6( 4774, 13186, 19753, 24154, 26962),  75 },
+        { AOM_CDF6( 3560, 10218, 15775, 20026, 23024),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
     },
     {
       {
-        { AOM_CDF6(16600, 30091, 31697, 32051, 32363),   6 },
-        { AOM_CDF6( 2731,  8192, 17476, 26761, 31676),  50 },
+        { AOM_CDF6(22472, 31406, 32415, 32617, 32686),  37 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 3067, 18669, 25626, 29742, 31100),  18 },
-        { AOM_CDF6(    4,  9589, 22611, 28009, 30613),  77 },
+        { AOM_CDF6( 4579, 20789, 27200, 30357, 31565),   0 },
+        { AOM_CDF6(    4, 12804, 24534, 29241, 31305),   7 },
       },
       {
-        { AOM_CDF6( 8619, 21012, 26594, 29276, 30618),   1 },
-        { AOM_CDF6(    4, 15042, 23453, 27645, 29444),   0 },
+        { AOM_CDF6(10553, 22962, 27982, 30214, 31394),   1 },
+        { AOM_CDF6(    4, 17230, 25117, 28842, 30403),   0 },
       },
       {
-        { AOM_CDF6( 5240, 12612, 18747, 23368, 26181),  15 },
-        { AOM_CDF6(    4,  7539, 14502, 20242, 24231),   3 },
+        { AOM_CDF6( 5244, 13272, 19764, 24354, 27332),  15 },
+        { AOM_CDF6(    4,  8510, 16126, 21941, 25809),   0 },
       },
       {
-        { AOM_CDF6( 3041,  9263, 14181, 18518, 21405),  78 },
-        { AOM_CDF6(    4,  5537, 10570, 15442, 19453),  78 },
+        { AOM_CDF6( 3263,  9944, 15196, 19855, 22889),  78 },
+        { AOM_CDF6(    4,  6173, 11683, 16946, 21240),  75 },
       },
       {
-        { AOM_CDF6( 1565,  6300,  9963, 13095, 15994),   5 },
-        { AOM_CDF6(  779,  4419,  8965, 12629, 16019),  90 },
+        { AOM_CDF6( 1953,  7145, 11524, 15201, 18227),   5 },
+        { AOM_CDF6(  290,  4454,  9436, 13541, 17364),  75 },
       },
       {
-        { AOM_CDF6( 1605,  5292,  8378, 11662, 14043),  75 },
-        { AOM_CDF6(    4,  3258,  6891,  9987, 12843), 100 },
+        { AOM_CDF6( 1722,  5876,  9313, 13099, 15693),  75 },
+        { AOM_CDF6(    4,  3730,  7620, 11131, 14444),  75 },
       },
       {
-        { AOM_CDF6( 1483,  4190,  6217,  8820, 10853),   0 },
-        { AOM_CDF6(   56,  2604,  5276,  8293, 10935), 115 },
+        { AOM_CDF6( 1665,  4813,  7575, 10457, 12877),   0 },
+        { AOM_CDF6(    4,  3095,  6224,  9491, 12462),  90 },
       },
       {
-        { AOM_CDF6(  787,  2600,  4032,  5559,  6943), 118 },
-        { AOM_CDF6(  344,  1185,  2450,  3906,  5098),  15 },
+        { AOM_CDF6( 1050,  3459,  5369,  7424,  9155),  93 },
+        { AOM_CDF6(  125,  1583,  3405,  5421,  7274),  15 },
       },
       {
-        { AOM_CDF6(27103, 32443, 32707, 32736, 32740),  75 },
-        { AOM_CDF6(20689, 26234, 31743, 32545, 32693),  93 },
+        { AOM_CDF6(25676, 31984, 32605, 32712, 32732),  75 },
+        { AOM_CDF6(22804, 26009, 31701, 32573, 32732),   0 },
       },
       {
-        { AOM_CDF6(13891, 27867, 31508, 32372, 32602),  15 },
-        { AOM_CDF6(    4, 22422, 29803, 31893, 32452),  75 },
+        { AOM_CDF6(13894, 27451, 31145, 32228, 32639),  15 },
+        { AOM_CDF6(    4, 23912, 30395, 32138, 32610),  75 },
       },
       {
-        { AOM_CDF6(13751, 26798, 30708, 32003, 32290),  81 },
-        { AOM_CDF6(    4, 21195, 28064, 30900, 31805),   6 },
+        { AOM_CDF6(14722, 26873, 30554, 31901, 32382),  81 },
+        { AOM_CDF6(    4, 19859, 27062, 30489, 31792),   6 },
       },
       {
-        { AOM_CDF6( 6768, 17699, 24498, 28246, 30138),  78 },
-        { AOM_CDF6(    5, 12645, 21281, 26256, 29381),   0 },
+        { AOM_CDF6( 6399, 16967, 23871, 27811, 30028),  78 },
+        { AOM_CDF6(    4, 13114, 21748, 26707, 29694),   0 },
       },
       {
-        { AOM_CDF6( 4456, 13369, 20192, 24504, 26869),  76 },
-        { AOM_CDF6(    6,  8366, 15696, 21363, 25582),  78 },
+        { AOM_CDF6( 4205, 12741, 19447, 23962, 26806),  76 },
+        { AOM_CDF6(    4,  8506, 15656, 21414, 25696),  78 },
       },
       {
-        { AOM_CDF6( 3486, 10293, 15986, 20473, 23764),  75 },
-        { AOM_CDF6(   12,  6810, 12754, 18065, 22085),  90 },
+        { AOM_CDF6( 3566, 10323, 16256, 20824, 24096),  75 },
+        { AOM_CDF6(    4,  6984, 13002, 18282, 22495),  90 },
       },
       {
-        { AOM_CDF6( 1535,  5332,  8845, 12113, 14118),   1 },
-        { AOM_CDF6(  306,  3603,  6981,  9853, 12569),  81 },
+        { AOM_CDF6( 1775,  5940,  9908, 13605, 16182),   0 },
+        { AOM_CDF6(   33,  4084,  7837, 11117, 14306),  80 },
       },
       {
-        { AOM_CDF6(27062, 32443, 32701, 32736, 32740),  90 },
-        { AOM_CDF6( 8783, 30921, 32606, 32736, 32740),  93 },
+        { AOM_CDF6(26506, 32458, 32715, 32736, 32740),  90 },
+        { AOM_CDF6( 8374, 30740, 32600, 32729, 32733),  93 },
       },
       {
-        { AOM_CDF6(19664, 30809, 32484, 32689, 32723),  75 },
-        { AOM_CDF6(  131, 27591, 32095, 32614, 32700),   5 },
+        { AOM_CDF6(20516, 31118, 32508, 32699, 32732),  75 },
+        { AOM_CDF6(    9, 27963, 32073, 32637, 32732),  75 },
       },
       {
-        { AOM_CDF6(15518, 28444, 31767, 32511, 32631),  80 },
-        { AOM_CDF6(  462, 23517, 30230, 32012, 32464),  80 },
+        { AOM_CDF6(15612, 28327, 31610, 32454, 32687),  80 },
+        { AOM_CDF6(   26, 24066, 30443, 32138, 32600),  80 },
       },
       {
-        { AOM_CDF6( 8448, 21327, 27877, 30781, 31894),  78 },
-        { AOM_CDF6(  285, 15715, 25287, 29627, 31507),  75 },
+        { AOM_CDF6( 8459, 21222, 27807, 30732, 31943),  78 },
+        { AOM_CDF6(   26, 16663, 26041, 30121, 31822),  75 },
       },
       {
-        { AOM_CDF6( 3875, 11272, 17192, 21524, 24517),  75 },
-        { AOM_CDF6(  250,  7725, 14392, 19419, 22992),  75 },
+        { AOM_CDF6( 4168, 12043, 18257, 22879, 26034),  75 },
+        { AOM_CDF6(   44,  8409, 15622, 20993, 24796),   0 },
       },
       {
-        { AOM_CDF6(30513, 32660, 32735, 32739, 32743),  75 },
-        { AOM_CDF6(30513, 32660, 32735, 32739, 32743),  75 },
+        { AOM_CDF6(30650, 32519, 32673, 32723, 32732),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(19741, 31317, 32435, 32635, 32696),  75 },
-        { AOM_CDF6(19741, 31317, 32435, 32635, 32696),  75 },
+        { AOM_CDF6(17529, 29628, 31828, 32359, 32545),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(12474, 26518, 30757, 31972, 32360),   1 },
-        { AOM_CDF6(12474, 26518, 30757, 31972, 32360),   1 },
+        { AOM_CDF6(10542, 21115, 26318, 29161, 30805),   7 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 8024, 19833, 26418, 29417, 30720),  31 },
-        { AOM_CDF6( 8024, 19833, 26418, 29417, 30720),  31 },
+        { AOM_CDF6(10247, 15768, 19711, 22296, 24028),  31 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 5339, 14743, 21943, 26369, 28810),   1 },
-        { AOM_CDF6( 5339, 14743, 21943, 26369, 28810),   1 },
+        { AOM_CDF6( 2397,  7449, 12493, 16590, 19724),  56 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 4118, 11547, 18150, 22872, 26018),   2 },
-        { AOM_CDF6( 4118, 11547, 18150, 22872, 26018),   2 },
+        { AOM_CDF6( 1869,  5577,  9489, 12835, 15631),  56 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2921,  8227, 13156, 17466, 20816),  31 },
-        { AOM_CDF6( 2921,  8227, 13156, 17466, 20816),  31 },
+        { AOM_CDF6( 1228,  3968,  6037,  8766, 10801),  55 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(31197, 32729, 32740, 32744, 32748),  75 },
-        { AOM_CDF6(31197, 32729, 32740, 32744, 32748),  75 },
+        { AOM_CDF6(31955, 32716, 32740, 32744, 32748),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(22157, 32007, 32636, 32730, 32734),  75 },
-        { AOM_CDF6(22157, 32007, 32636, 32730, 32734),  75 },
+        { AOM_CDF6(22693, 31709, 32467, 32593, 32659),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(14153, 28311, 31723, 32428, 32619),  90 },
-        { AOM_CDF6(14153, 28311, 31723, 32428, 32619),  90 },
+        { AOM_CDF6(14735, 26877, 30393, 31770, 32325),   1 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 8964, 22454, 28710, 31129, 32018),  95 },
-        { AOM_CDF6( 8964, 22454, 28710, 31129, 32018),  95 },
+        { AOM_CDF6( 9390, 20635, 25906, 28733, 30212),   6 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 5502, 15192, 22260, 26601, 29088),   1 },
-        { AOM_CDF6( 5502, 15192, 22260, 26601, 29088),   1 },
+        { AOM_CDF6( 4403, 11798, 18101, 22593, 25468),   5 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
     },
     {
       {
-        { AOM_CDF6(12476, 22387, 26876, 28913, 29686),  32 },
-        { AOM_CDF6(11565, 12850, 22488, 24415, 29555),  50 },
+        { AOM_CDF6(17498, 29424, 31225, 31893, 32132),  62 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 4632, 16778, 22218, 27222, 29538),  76 },
-        { AOM_CDF6(    4,  9182, 21676, 28011, 30127),  76 },
+        { AOM_CDF6( 4465, 19403, 25248, 29392, 31099),   7 },
+        { AOM_CDF6(    4, 11650, 23783, 29177, 30996),   7 },
       },
       {
-        { AOM_CDF6( 6271, 16535, 22522, 26294, 28910),   1 },
-        { AOM_CDF6(  627, 11356, 20018, 24334, 26367),   6 },
+        { AOM_CDF6( 9152, 21002, 26411, 29197, 30838),   6 },
+        { AOM_CDF6(  387, 15169, 23639, 27517, 29225),   7 },
       },
       {
-        { AOM_CDF6( 3846, 11479, 15961, 21049, 23798),  76 },
-        { AOM_CDF6(    4,  6789, 13456, 18824, 22259),   1 },
+        { AOM_CDF6( 4263, 12796, 18125, 23216, 25968),  76 },
+        { AOM_CDF6(    4,  8811, 16017, 21391, 24903),   1 },
       },
       {
-        { AOM_CDF6( 2668,  6958, 12011, 16127, 19511),  75 },
-        { AOM_CDF6(   16,  5282, 10055, 14498, 18215), 100 },
+        { AOM_CDF6( 2963,  7692, 13120, 17437, 20742),  75 },
+        { AOM_CDF6(    4,  5759, 11337, 16128, 19807),  78 },
       },
       {
-        { AOM_CDF6( 2457,  6882, 10382, 12104, 14356), 100 },
-        { AOM_CDF6(   50,  3653,  6698, 10997, 15151), 100 },
+        { AOM_CDF6( 2381,  7283, 11060, 13175, 15657),  78 },
+        { AOM_CDF6(   30,  3641,  7204, 11473, 15621),  76 },
       },
       {
-        { AOM_CDF6( 1332,  5580,  7419, 10065, 12677), 103 },
-        { AOM_CDF6( 1729,  2053,  5025,  9241, 12032), 100 },
+        { AOM_CDF6( 1314,  5852,  7870, 11057, 13558),  75 },
+        { AOM_CDF6( 1846,  2126,  5191,  9398, 12426),  75 },
       },
       {
-        { AOM_CDF6( 1961,  5692,  7972, 10797, 13274), 100 },
-        { AOM_CDF6(  613,   724,  4216,  5464,  7542),  31 },
+        { AOM_CDF6( 1838,  5614,  8157, 11023, 13394),  93 },
+        { AOM_CDF6(  711,   875,  4561,  6006,  8631),  31 },
       },
       {
-        { AOM_CDF6( 1093,  2768,  4888,  7027,  8432), 118 },
-        { AOM_CDF6(    4,   721,  1451,  1935,  2546),  25 },
+        { AOM_CDF6( 1166,  3234,  5698,  8017,  9616),  93 },
+        { AOM_CDF6(   25,  1054,  2149,  3082,  4062),   0 },
       },
       {
-        { AOM_CDF6(26062, 32026, 32603, 32715, 32732),   6 },
-        { AOM_CDF6(14735, 26695, 31909, 32575, 32714),  16 },
+        { AOM_CDF6(26289, 31974, 32589, 32707, 32732),   6 },
+        { AOM_CDF6(15601, 27297, 32026, 32579, 32732),  30 },
       },
       {
-        { AOM_CDF6(14374, 28377, 31733, 32528, 32628),  92 },
-        { AOM_CDF6(  169, 24931, 30736, 32170, 32579),  85 },
+        { AOM_CDF6(14722, 28032, 31407, 32465, 32660),  92 },
+        { AOM_CDF6(    4, 25486, 30863, 32285, 32652),  81 },
       },
       {
-        { AOM_CDF6(12202, 24597, 28881, 31127, 32007),  90 },
-        { AOM_CDF6(  387, 19841, 27589, 30390, 31613),  76 },
+        { AOM_CDF6(14143, 25751, 29446, 31254, 32093),  75 },
+        { AOM_CDF6(   54, 19128, 26757, 29947, 31382),   1 },
       },
       {
-        { AOM_CDF6( 6042, 17002, 23576, 27702, 29959),  75 },
-        { AOM_CDF6(  444, 12991, 21846, 26889, 29336),  81 },
+        { AOM_CDF6( 5488, 15901, 22490, 26764, 29217),  75 },
+        { AOM_CDF6(   61, 12497, 20739, 25857, 28681),   6 },
       },
       {
-        { AOM_CDF6( 4218, 11757, 18168, 22459, 25711),  75 },
-        { AOM_CDF6(   20,  8709, 15833, 21179, 25095),  75 },
+        { AOM_CDF6( 4022, 11170, 17442, 21682, 24925),  75 },
+        { AOM_CDF6(    4,  7890, 14887, 20318, 24465),  75 },
       },
       {
-        { AOM_CDF6( 3078, 10061, 15459, 20578, 23302),   0 },
-        { AOM_CDF6(  629,  6627, 12718, 17719, 21044),   1 },
+        { AOM_CDF6( 3011,  9192, 14601, 19495, 22381),   0 },
+        { AOM_CDF6(  328,  6291, 12024, 16828, 20336),   1 },
       },
       {
-        { AOM_CDF6( 1710,  4971,  8028, 10994, 13332), 115 },
-        { AOM_CDF6(  152,  3374,  6812,  9963, 12672),  90 },
+        { AOM_CDF6( 1563,  4884,  8005, 10967, 13252),  90 },
+        { AOM_CDF6(   14,  3264,  6674,  9678, 12501),  90 },
       },
       {
-        { AOM_CDF6(26911, 32367, 32732, 32736, 32740),  75 },
-        { AOM_CDF6( 8376, 31803, 32729, 32736, 32740), 106 },
+        { AOM_CDF6(28318, 32551, 32737, 32741, 32745),  75 },
+        { AOM_CDF6( 8123, 31532, 32680, 32736, 32740),  76 },
       },
       {
-        { AOM_CDF6(19996, 30927, 32462, 32682, 32732),  75 },
-        { AOM_CDF6(  890, 27922, 32179, 32619, 32718),   0 },
+        { AOM_CDF6(21238, 31149, 32509, 32707, 32732),  75 },
+        { AOM_CDF6(  138, 28353, 32132, 32659, 32732),   0 },
       },
       {
-        { AOM_CDF6(16027, 28867, 31904, 32505, 32639),   1 },
-        { AOM_CDF6( 1355, 23391, 29938, 31872, 32440),  83 },
+        { AOM_CDF6(16317, 28616, 31700, 32471, 32706),   1 },
+        { AOM_CDF6(  645, 23978, 30123, 31941, 32494),  83 },
       },
       {
-        { AOM_CDF6( 8230, 21419, 27867, 30603, 31809),  93 },
-        { AOM_CDF6(  598, 16010, 25389, 29646, 31481),  93 },
+        { AOM_CDF6( 8177, 21167, 27635, 30495, 31817),  93 },
+        { AOM_CDF6(  240, 16105, 25295, 29540, 31448),  75 },
       },
       {
-        { AOM_CDF6( 3694, 10738, 16136, 20260, 22972),  76 },
-        { AOM_CDF6(  221,  7466, 13738, 18195, 21397),   1 },
+        { AOM_CDF6( 3393,  9936, 15268, 19487, 22467),  76 },
+        { AOM_CDF6(  100,  7031, 13173, 17962, 21368),   1 },
       },
       {
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
@@ -4828,88 +4828,88 @@
     },
     {
       {
-        { AOM_CDF6( 9166, 19415, 22900, 26209, 27731),  32 },
+        { AOM_CDF6(14193, 27782, 31321, 32004, 32607),  50 },
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1877, 11631, 19591, 24107, 28355),   5 },
-        { AOM_CDF6(    5,  5792, 19771, 24553, 28482),   6 },
+        { AOM_CDF6( 1210, 13319, 22982, 27380, 30780),  37 },
+        { AOM_CDF6(    4,  7290, 20938, 26753, 30532),  32 },
       },
       {
-        { AOM_CDF6( 5028, 14669, 19999, 24201, 26854),   7 },
-        { AOM_CDF6(  188,  9086, 13171, 19579, 22691),  32 },
+        { AOM_CDF6( 6129, 19017, 24319, 27326, 29222),  32 },
+        { AOM_CDF6(  108, 12264, 17594, 22318, 25161),  57 },
       },
       {
-        { AOM_CDF6( 2294, 14281, 14937, 17103, 19192),  32 },
-        { AOM_CDF6( 1618,  3446,  9623, 15987, 19755),  78 },
+        { AOM_CDF6( 3672, 16362, 17673, 20077, 22838),  26 },
+        { AOM_CDF6( 1389,  4066, 11635, 17622, 22074),   7 },
       },
       {
-        { AOM_CDF6( 1967,  8436, 10048, 12275, 14789),  25 },
-        { AOM_CDF6(  227,  2750,  3898, 10215, 13920),  26 },
+        { AOM_CDF6( 2395,  9381, 12019, 14390, 17169),  40 },
+        { AOM_CDF6(  123,  3545,  5521, 12207, 15924),  33 },
       },
       {
-        { AOM_CDF6( 1813,  5150,  7811, 10378, 12906),  94 },
-        { AOM_CDF6(   48,  3235,  7391,  8671, 11349),  75 },
+        { AOM_CDF6( 2084,  5758,  9241, 11873, 14327),  93 },
+        { AOM_CDF6(   14,  4141,  8239, 10165, 13119),  93 },
       },
       {
-        { AOM_CDF6( 1250,  3797,  6249,  8067,  9487),  24 },
-        { AOM_CDF6(  788,  2186,  4559,  8171, 10685),  84 },
+        { AOM_CDF6( 1510,  4925,  7765, 10264, 12295),  18 },
+        { AOM_CDF6(  424,  2326,  5212,  9049, 12105),  93 },
       },
       {
-        { AOM_CDF6( 1135,  4473,  6534,  8660, 10004),  22 },
-        { AOM_CDF6(  528,  1408,  3097,  4681,  7488),  19 },
+        { AOM_CDF6( 1310,  4491,  6944,  9377, 11560),  17 },
+        { AOM_CDF6(  796,  2092,  4230,  6299,  9460),  18 },
       },
       {
-        { AOM_CDF6(  496,  1447,  2431,  3327,  3864),  93 },
-        { AOM_CDF6(  440,   928,  1990,  2834,  3711),  90 },
+        { AOM_CDF6(  575,  2082,  3357,  4723,  5504),  93 },
+        { AOM_CDF6(  407,  1183,  2575,  3784,  5063),  90 },
       },
       {
-        { AOM_CDF6(24090, 30786, 31979, 32633, 32701),  31 },
-        { AOM_CDF6( 3548, 27852, 31480, 32390, 32684),  26 },
+        { AOM_CDF6(21859, 29753, 31615, 32585, 32702),  31 },
+        { AOM_CDF6( 3511, 29157, 31832, 32567, 32701),  65 },
       },
       {
-        { AOM_CDF6(13259, 26393, 31052, 32197, 32398),   1 },
-        { AOM_CDF6(  183, 23714, 30229, 31519, 32174),  32 },
+        { AOM_CDF6(13469, 26644, 30586, 31697, 32163),  27 },
+        { AOM_CDF6(   43, 24491, 30511, 31649, 32156),  32 },
       },
       {
-        { AOM_CDF6(10597, 23480, 28322, 30586, 31626),  76 },
-        { AOM_CDF6(  116, 17250, 24532, 28401, 30475),   6 },
+        { AOM_CDF6(11517, 23927, 28667, 30593, 31651),   1 },
+        { AOM_CDF6(   25, 17446, 24435, 28271, 30325),   6 },
       },
       {
-        { AOM_CDF6( 6688, 17150, 22414, 26495, 27903),   1 },
-        { AOM_CDF6(  269,  8285, 17370, 23434, 26939),  75 },
+        { AOM_CDF6( 6058, 16232, 22050, 26218, 27912),   1 },
+        { AOM_CDF6(  168,  8904, 17397, 23318, 27175),  75 },
       },
       {
-        { AOM_CDF6( 3076, 10090, 16289, 19838, 23214),   0 },
-        { AOM_CDF6(  395,  7105, 12459, 18350, 22226),   0 },
+        { AOM_CDF6( 3216,  9575, 15671, 19813, 23338),  76 },
+        { AOM_CDF6(   65,  6797, 12411, 18393, 22224),   1 },
       },
       {
-        { AOM_CDF6( 2703,  8018, 10824, 15739, 19225),   0 },
-        { AOM_CDF6(  886,  5419, 11713, 16761, 20089),  16 },
+        { AOM_CDF6( 2705,  8581, 12260, 16653, 20249),  90 },
+        { AOM_CDF6(  396,  5255, 11135, 16441, 20215),   0 },
       },
       {
-        { AOM_CDF6(  859,  2732,  4924,  7222,  8244),   0 },
-        { AOM_CDF6(  142,  2303,  4463,  5921,  7690),   0 },
+        { AOM_CDF6( 1193,  3568,  6140,  8638, 10114),  93 },
+        { AOM_CDF6(   11,  2647,  5137,  7270,  9301),  75 },
       },
       {
-        { AOM_CDF6(27211, 32516, 32737, 32741, 32745),  25 },
-        { AOM_CDF6( 8649, 31088, 32683, 32736, 32740),  17 },
+        { AOM_CDF6(27677, 32597, 32738, 32742, 32746),  26 },
+        { AOM_CDF6( 9101, 31116, 32717, 32736, 32740),   2 },
       },
       {
-        { AOM_CDF6(17214, 29762, 32135, 32605, 32709),  75 },
-        { AOM_CDF6(  940, 27073, 31747, 32535, 32685),  16 },
+        { AOM_CDF6(17896, 30207, 32257, 32653, 32732),  75 },
+        { AOM_CDF6(  325, 26949, 31766, 32617, 32732),  16 },
       },
       {
-        { AOM_CDF6(13144, 26209, 30425, 31816, 32364),  90 },
-        { AOM_CDF6( 1459, 22447, 29150, 31555, 32278),  80 },
+        { AOM_CDF6(13007, 26339, 30456, 31958, 32494),  75 },
+        { AOM_CDF6(  638, 21532, 29168, 31580, 32346),  80 },
       },
       {
-        { AOM_CDF6( 6329, 19447, 26168, 29738, 31350),  26 },
-        { AOM_CDF6(  951, 14635, 23268, 28098, 30172),  26 },
+        { AOM_CDF6( 6432, 18636, 25684, 29741, 31417),   0 },
+        { AOM_CDF6(  399, 14022, 22914, 27926, 30488),   1 },
       },
       {
-        { AOM_CDF6( 2403,  7249, 11277, 14779, 17316),  75 },
-        { AOM_CDF6(  286,  4813,  9356, 12895, 15764),  80 },
+        { AOM_CDF6( 2460,  7366, 11813, 15406, 18038),  90 },
+        { AOM_CDF6(  141,  5139,  9696, 13649, 16881),  75 },
       },
       {
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
@@ -4964,490 +4964,490 @@
   {
     {
       {
-        { AOM_CDF6( 4842, 20907, 25073, 29765, 32167), 100 },
+        { AOM_CDF6( 3361, 19325, 24366, 31088, 31928),  50 },
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1514, 13849, 21779, 26227, 28876),   2 },
-        { AOM_CDF6(    4,  4626, 20048, 28108, 30770),   0 },
+        { AOM_CDF6( 1632, 15337, 24150, 28503, 30563),   2 },
+        { AOM_CDF6(    4,  5295, 20829, 28126, 30850),   0 },
       },
       {
-        { AOM_CDF6( 5384, 14511, 21744, 25595, 28838),   3 },
-        { AOM_CDF6(    4, 10090, 17476, 23457, 27340),  25 },
+        { AOM_CDF6( 6632, 16063, 23298, 27040, 29721),   3 },
+        { AOM_CDF6(    4, 11374, 19507, 24923, 28568),  25 },
       },
       {
-        { AOM_CDF6( 4339,  9530, 15457, 19631, 23750),  18 },
-        { AOM_CDF6(    4,  4561, 13182, 19543, 23775),   0 },
+        { AOM_CDF6( 4909, 11090, 17838, 22385, 26279),  15 },
+        { AOM_CDF6(   35,  6017, 15862, 22480, 26459),   0 },
       },
       {
-        { AOM_CDF6( 2987,  8244, 12055, 15728, 19137),   3 },
-        { AOM_CDF6(    4,  5362,  7872, 14521, 18879),  15 },
+        { AOM_CDF6( 3589,  9811, 14531, 19054, 22695),   3 },
+        { AOM_CDF6(    4,  6364,  9855, 16927, 21591),   0 },
       },
       {
-        { AOM_CDF6( 2144,  6000, 10259, 12320, 15759),   0 },
-        { AOM_CDF6(    4,  2260,  6384,  9936, 13243),  23 },
+        { AOM_CDF6( 2743,  7444, 12418, 15058, 19040),   0 },
+        { AOM_CDF6(    6,  2870,  8495, 12527, 16693),  18 },
       },
       {
-        { AOM_CDF6( 1358,  5655,  9098, 13116, 14912),  93 },
-        { AOM_CDF6(    4,   860,  1688,  4919,  6113),  23 },
+        { AOM_CDF6( 1596,  6378, 10210, 14940, 17169),  93 },
+        { AOM_CDF6(    4,  1626,  3090,  7519,  9718),  18 },
       },
       {
-        { AOM_CDF6(  594,  3593,  6103,  9148, 11505),   5 },
-        { AOM_CDF6(    4,  3184,  4747,  7666,  9458),  15 },
+        { AOM_CDF6(  648,  4541,  7588, 11572, 14642),   5 },
+        { AOM_CDF6(    5,  3893,  6075,  9405, 12116),  18 },
       },
       {
-        { AOM_CDF6( 1234,  2833,  3871,  4753,  5448),   5 },
-        { AOM_CDF6(   20,  2184,  2948,  6053,  6854), 120 },
+        { AOM_CDF6( 1519,  3450,  5055,  6173,  7170),   8 },
+        { AOM_CDF6(    5,  2567,  3706,  7533,  9113),  90 },
       },
       {
-        { AOM_CDF6(13560, 27057, 30156, 32100, 32378),  78 },
-        { AOM_CDF6( 1140, 23865, 30853, 32090, 32459),   0 },
+        { AOM_CDF6(14288, 28805, 31683, 32583, 32700),  78 },
+        { AOM_CDF6(   64, 24516, 31405, 32371, 32655),   6 },
       },
       {
-        { AOM_CDF6( 7642, 21486, 28197, 31175, 31944),  78 },
-        { AOM_CDF6(    4, 14682, 25263, 30248, 31687),   0 },
+        { AOM_CDF6( 8353, 22447, 29049, 31579, 32315),  78 },
+        { AOM_CDF6(    4, 16982, 27998, 31526, 32421),   0 },
       },
       {
-        { AOM_CDF6( 6527, 16184, 23111, 27765, 30299),  75 },
-        { AOM_CDF6(   18, 12047, 21862, 26583, 30085),   0 },
+        { AOM_CDF6( 7498, 18802, 25718, 29605, 31419),  75 },
+        { AOM_CDF6(    4, 13992, 23750, 28392, 31093),   0 },
       },
       {
-        { AOM_CDF6( 5157, 13727, 20385, 26095, 28852),  78 },
-        { AOM_CDF6(    4, 11192, 19773, 24679, 27119),   0 },
+        { AOM_CDF6( 5931, 15139, 22182, 27418, 29974),  78 },
+        { AOM_CDF6(    4, 12206, 21157, 26583, 29002),   0 },
       },
       {
-        { AOM_CDF6( 3723, 10748, 17510, 23330, 26361),   0 },
-        { AOM_CDF6(    4,  7023, 14782, 19611, 24566),   1 },
+        { AOM_CDF6( 4417, 12408, 19565, 24937, 27743),   0 },
+        { AOM_CDF6(    6,  8793, 17130, 22092, 26855),   1 },
       },
       {
-        { AOM_CDF6( 3188,  9214, 14785, 19482, 23156),  78 },
-        { AOM_CDF6(   32,  6579, 12195, 18385, 23198),  19 },
+        { AOM_CDF6( 3697, 10293, 16641, 21345, 25242),  78 },
+        { AOM_CDF6(    4,  7551, 14182, 20667, 25647),  18 },
       },
       {
-        { AOM_CDF6( 3509,  8518, 13498, 17740, 20515),  91 },
-        { AOM_CDF6(  284,  3964,  9251, 14644, 18710),  18 },
+        { AOM_CDF6( 3788, 10092, 15480, 20531, 23568),  76 },
+        { AOM_CDF6(   30,  4783, 10714, 16396, 20863),   0 },
       },
       {
-        { AOM_CDF6(20237, 29828, 32066, 32618, 32689),  93 },
-        { AOM_CDF6( 9257, 25279, 31700, 32524, 32624),   3 },
+        { AOM_CDF6(18808, 30564, 32414, 32708, 32732),  93 },
+        { AOM_CDF6( 8341, 26149, 31856, 32628, 32726),   3 },
       },
       {
-        { AOM_CDF6(12703, 26424, 31123, 32320, 32526),  75 },
-        { AOM_CDF6(  447, 20271, 29487, 31983, 32481),   3 },
+        { AOM_CDF6(13189, 27414, 31625, 32526, 32712),  90 },
+        { AOM_CDF6(   95, 21665, 30252, 32221, 32614),   3 },
       },
       {
-        { AOM_CDF6( 9174, 21444, 28049, 30969, 32021),  78 },
-        { AOM_CDF6(   51, 14914, 25199, 29991, 32033),  75 },
+        { AOM_CDF6( 9837, 22542, 28890, 31327, 32298),  78 },
+        { AOM_CDF6(    6, 16453, 26512, 30728, 32308),  75 },
       },
       {
-        { AOM_CDF6( 6755, 17178, 24052, 28728, 30983),  78 },
-        { AOM_CDF6(  182,  9960, 20549, 26765, 30196),  75 },
+        { AOM_CDF6( 7017, 18407, 25212, 29652, 31622),  78 },
+        { AOM_CDF6(   31, 11962, 22617, 28211, 31109),  75 },
       },
       {
-        { AOM_CDF6( 4805, 13231, 19767, 24730, 28488),  78 },
-        { AOM_CDF6(  392,  7136, 15755, 22803, 27395),  79 },
+        { AOM_CDF6( 5446, 14294, 21338, 26300, 29677),  78 },
+        { AOM_CDF6(  156,  8220, 17040, 23841, 28514),  78 },
       },
       {
-        { AOM_CDF6(23001, 31002, 32088, 32414, 32533),  75 },
-        { AOM_CDF6(23001, 31002, 32088, 32414, 32533),  75 },
+        { AOM_CDF6(24803, 31286, 32079, 32381, 32540),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(13016, 26663, 30462, 31649, 32090),  93 },
-        { AOM_CDF6(13016, 26663, 30462, 31649, 32090),  93 },
+        { AOM_CDF6(12821, 26214, 30050, 31373, 31972),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 8120, 18424, 25072, 28576, 30186),  75 },
-        { AOM_CDF6( 8120, 18424, 25072, 28576, 30186),  75 },
+        { AOM_CDF6( 7896, 17264, 23904, 27850, 29752),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 6827, 14574, 20370, 24129, 26517), 115 },
-        { AOM_CDF6( 6827, 14574, 20370, 24129, 26517), 115 },
+        { AOM_CDF6( 7045, 14770, 19995, 23659, 26108),  78 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2718,  7699, 12922, 17322, 20773),  75 },
-        { AOM_CDF6( 2718,  7699, 12922, 17322, 20773),  75 },
+        { AOM_CDF6( 2310,  6418, 12150, 16868, 20631),  78 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1747,  5672,  9462, 12967, 16209),   3 },
-        { AOM_CDF6( 1747,  5672,  9462, 12967, 16209),   3 },
+        { AOM_CDF6( 1672,  5533, 10030, 13735, 17567),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1058,  3245,  5643,  8186, 10793), 124 },
-        { AOM_CDF6( 1058,  3245,  5643,  8186, 10793), 124 },
+        { AOM_CDF6( 1219,  4524,  7028, 10416, 13388),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(28877, 32461, 32685, 32733, 32737),  75 },
-        { AOM_CDF6(28877, 32461, 32685, 32733, 32737),  75 },
+        { AOM_CDF6(29688, 32425, 32651, 32731, 32735),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(16158, 27458, 31241, 32250, 32529),  90 },
-        { AOM_CDF6(16158, 27458, 31241, 32250, 32529),  90 },
+        { AOM_CDF6(15856, 26584, 30786, 32053, 32570),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 9349, 18871, 25289, 29138, 30802),  75 },
-        { AOM_CDF6( 9349, 18871, 25289, 29138, 30802),  75 },
+        { AOM_CDF6( 8823, 17890, 24454, 28342, 30615),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 7699, 16203, 21865, 25564, 28151),  98 },
-        { AOM_CDF6( 7699, 16203, 21865, 25564, 28151),  98 },
+        { AOM_CDF6( 7001, 15331, 21333, 25485, 28372),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 3777,  9327, 13955, 18482, 22279),  93 },
-        { AOM_CDF6( 3777,  9327, 13955, 18482, 22279),  93 },
+        { AOM_CDF6( 3542, 10300, 15274, 19865, 23271),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
     },
     {
       {
-        { AOM_CDF6(17446, 31630, 31974, 32480, 32694),   6 },
-        { AOM_CDF6(  745, 20108, 23087, 26810, 30534),  50 },
+        { AOM_CDF6(20460, 32339, 32513, 32662, 32732),  13 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(  444, 16536, 26602, 30636, 31752),  75 },
-        { AOM_CDF6(    4,  4122, 20984, 28078, 30725),  75 },
+        { AOM_CDF6(  283, 17174, 26580, 30375, 31638),  75 },
+        { AOM_CDF6(    4,  5576, 21745, 28213, 30821),  75 },
       },
       {
-        { AOM_CDF6(11064, 22139, 26505, 29252, 31031),   0 },
-        { AOM_CDF6(    4, 15609, 25598, 29542, 30754),   0 },
+        { AOM_CDF6(11048, 22170, 26485, 29197, 30921),   0 },
+        { AOM_CDF6(    4, 16199, 25093, 29139, 30504),   0 },
       },
       {
-        { AOM_CDF6( 7901, 14684, 20503, 25735, 28535),   0 },
-        { AOM_CDF6(    4,  6765, 18326, 23476, 26890),  78 },
+        { AOM_CDF6( 6377, 13511, 19779, 25102, 28132),   0 },
+        { AOM_CDF6(    4,  7377, 18122, 23594, 27200),  78 },
       },
       {
-        { AOM_CDF6( 4852,  9912, 15528, 20821, 24193),   0 },
-        { AOM_CDF6(    4,  5364, 11819, 16875, 20416),   0 },
+        { AOM_CDF6( 4500, 10287, 15895, 21180, 24672),   0 },
+        { AOM_CDF6(   16,  5691, 12262, 17802, 21695),   0 },
       },
       {
-        { AOM_CDF6( 2929,  7620, 12076, 16248, 19712),  94 },
-        { AOM_CDF6(    4,  4388,  9223, 12734, 16601),  91 },
+        { AOM_CDF6( 2790,  7843, 12604, 16931, 20564),  93 },
+        { AOM_CDF6(    4,  4821,  9847, 13980, 18278),  91 },
       },
       {
-        { AOM_CDF6( 1329,  6883,  9969, 13370, 16430),  76 },
-        { AOM_CDF6( 1701,  2909,  6304,  9767, 12844),  16 },
+        { AOM_CDF6( 1381,  7439, 10964, 14802, 18073),  76 },
+        { AOM_CDF6( 1522,  2450,  6619, 10499, 14157),  16 },
       },
       {
-        { AOM_CDF6( 1728,  4758,  7450, 10296, 12623),  90 },
-        { AOM_CDF6(  574,  2684,  5942,  9418, 11472),  90 },
+        { AOM_CDF6( 2025,  5643,  8935, 12150, 14843),  90 },
+        { AOM_CDF6(  224,  2917,  6661, 10512, 13337),  90 },
       },
       {
-        { AOM_CDF6( 1206,  3006,  5077,  6698,  7964),  90 },
-        { AOM_CDF6(  351,  2285,  4410,  6357,  8731),  94 },
+        { AOM_CDF6( 1368,  3825,  6654,  9038, 11091),  90 },
+        { AOM_CDF6(   41,  2582,  5312,  7720, 10479),  90 },
       },
       {
-        { AOM_CDF6(23149, 32286, 32623, 32713, 32732),  85 },
-        { AOM_CDF6(22930, 25618, 32221, 32613, 32674),  75 },
+        { AOM_CDF6(20410, 31676, 32514, 32692, 32732),  80 },
+        { AOM_CDF6(25631, 26346, 32305, 32649, 32732),   6 },
       },
       {
-        { AOM_CDF6( 9103, 27259, 31347, 32439, 32593),  75 },
-        { AOM_CDF6(    4, 21001, 30139, 32124, 32487),   0 },
+        { AOM_CDF6( 9017, 26371, 30820, 32288, 32624),  75 },
+        { AOM_CDF6(    4, 20642, 29893, 32138, 32626),   0 },
       },
       {
-        { AOM_CDF6(12805, 24769, 29614, 31745, 32243),  90 },
-        { AOM_CDF6(    4, 21576, 29438, 31527, 32139),   1 },
+        { AOM_CDF6(11957, 24371, 29434, 31605, 32329),  90 },
+        { AOM_CDF6(    4, 19715, 28037, 30945, 32081),   1 },
       },
       {
-        { AOM_CDF6( 7436, 18420, 25204, 29137, 30970),  75 },
-        { AOM_CDF6(    4, 13571, 23401, 28424, 30593),  75 },
+        { AOM_CDF6( 6587, 17392, 24549, 28765, 30910),  75 },
+        { AOM_CDF6(    4, 13017, 22846, 28010, 30563),  75 },
       },
       {
-        { AOM_CDF6( 5097, 13176, 20234, 25354, 28201),  90 },
-        { AOM_CDF6(    4,  9566, 18132, 23444, 27202),  75 },
+        { AOM_CDF6( 4820, 13076, 20235, 25274, 28367),  90 },
+        { AOM_CDF6(    4,  9517, 18022, 23590, 27505),  75 },
       },
       {
-        { AOM_CDF6( 3818, 10970, 16891, 21884, 25227),  93 },
-        { AOM_CDF6(   14,  7280, 14388, 20162, 24092),  90 },
+        { AOM_CDF6( 3839, 11042, 17152, 22327, 25816),  93 },
+        { AOM_CDF6(    4,  7434, 14558, 20495, 24720),  90 },
       },
       {
-        { AOM_CDF6( 3110,  9110, 14002, 17782, 20457),  93 },
-        { AOM_CDF6(  345,  3823,  8446, 12922, 17200),  78 },
+        { AOM_CDF6( 3178,  9048, 14018, 18246, 21456),  93 },
+        { AOM_CDF6(   41,  4587,  9592, 14488, 18984),  75 },
       },
       {
-        { AOM_CDF6(27209, 32546, 32704, 32736, 32740), 100 },
-        { AOM_CDF6( 8092, 30462, 32633, 32717, 32732),  75 },
+        { AOM_CDF6(24602, 32389, 32700, 32736, 32740),  75 },
+        { AOM_CDF6( 7626, 30290, 32589, 32730, 32734),  75 },
       },
       {
-        { AOM_CDF6(17310, 30556, 32463, 32687, 32714),  75 },
-        { AOM_CDF6(   23, 26050, 31978, 32599, 32677),   0 },
+        { AOM_CDF6(17206, 30451, 32404, 32696, 32732),  90 },
+        { AOM_CDF6(    4, 26159, 31880, 32631, 32732),  75 },
       },
       {
-        { AOM_CDF6(13830, 27352, 31478, 32446, 32589),  75 },
-        { AOM_CDF6(   41, 21949, 29752, 32000, 32456),   0 },
+        { AOM_CDF6(12799, 26717, 31223, 32384, 32678),  75 },
+        { AOM_CDF6(    4, 21576, 29603, 32028, 32595),   0 },
       },
       {
-        { AOM_CDF6( 8213, 21159, 28070, 31157, 32059),  78 },
-        { AOM_CDF6(   90, 15277, 25296, 29905, 31684),  78 },
+        { AOM_CDF6( 7923, 20676, 27760, 30909, 32092),  78 },
+        { AOM_CDF6(   10, 15320, 25351, 29888, 31811),  78 },
       },
       {
-        { AOM_CDF6( 4597, 13368, 20248, 25108, 28086),  78 },
-        { AOM_CDF6(   98,  8889, 16780, 22652, 26736),  78 },
+        { AOM_CDF6( 4552, 13193, 20089, 24958, 28270),  78 },
+        { AOM_CDF6(   29,  9104, 17079, 23044, 27203),  78 },
       },
       {
-        { AOM_CDF6(29681, 32477, 32658, 32712, 32731),  75 },
-        { AOM_CDF6(29681, 32477, 32658, 32712, 32731),  75 },
+        { AOM_CDF6(29032, 32327, 32595, 32682, 32720),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(16011, 29320, 31832, 32399, 32555), 115 },
-        { AOM_CDF6(16011, 29320, 31832, 32399, 32555), 115 },
+        { AOM_CDF6(16965, 29286, 31651, 32307, 32527),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 9294, 21806, 27768, 30409, 31521),  90 },
-        { AOM_CDF6( 9294, 21806, 27768, 30409, 31521),  90 },
+        { AOM_CDF6( 9346, 21389, 27317, 29974, 31327),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 6107, 14952, 21511, 25626, 28146),  75 },
-        { AOM_CDF6( 6107, 14952, 21511, 25626, 28146),  75 },
+        { AOM_CDF6( 6585, 15649, 21693, 25674, 28044),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2990,  9058, 15121, 20098, 23744),  90 },
-        { AOM_CDF6( 2990,  9058, 15121, 20098, 23744),  90 },
+        { AOM_CDF6( 3417, 10093, 16159, 21188, 24606),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2157,  6562, 11095, 15323, 19234),  75 },
-        { AOM_CDF6( 2157,  6562, 11095, 15323, 19234),  75 },
+        { AOM_CDF6( 2304,  7456, 12293, 16563, 20267),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1346,  3906,  6845,  9832, 12783),  90 },
-        { AOM_CDF6( 1346,  3906,  6845,  9832, 12783),  90 },
+        { AOM_CDF6( 1811,  5284,  8853, 12277, 15769),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(30626, 32666, 32740, 32744, 32748),   0 },
-        { AOM_CDF6(30626, 32666, 32740, 32744, 32748),   0 },
+        { AOM_CDF6(30975, 32679, 32738, 32742, 32746),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(19326, 30715, 32384, 32644, 32713),  93 },
-        { AOM_CDF6(19326, 30715, 32384, 32644, 32713),  93 },
+        { AOM_CDF6(20345, 30725, 32278, 32643, 32726),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(11868, 25066, 29958, 31653, 32254), 115 },
-        { AOM_CDF6(11868, 25066, 29958, 31653, 32254), 115 },
+        { AOM_CDF6(12243, 25011, 29788, 31583, 32260),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 8124, 19467, 26069, 29307, 30909), 115 },
-        { AOM_CDF6( 8124, 19467, 26069, 29307, 30909), 115 },
+        { AOM_CDF6( 8494, 19928, 26600, 29501, 31142),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 4754, 12825, 19113, 23576, 26611),  90 },
-        { AOM_CDF6( 4754, 12825, 19113, 23576, 26611),  90 },
+        { AOM_CDF6( 4992, 13924, 20358, 24637, 27524),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
     },
     {
       {
-        { AOM_CDF6(19498, 31803, 32362, 32603, 32717),   7 },
-        { AOM_CDF6( 1074, 19876, 25247, 29814, 32231),  50 },
+        { AOM_CDF6(24594, 32389, 32641, 32718, 32732),  37 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1716, 19324, 26985, 30752, 31712),   1 },
-        { AOM_CDF6(    4,  7344, 23296, 27775, 30880),   5 },
+        { AOM_CDF6( 2358, 19217, 26997, 30649, 31793),   1 },
+        { AOM_CDF6(    4, 10990, 24500, 28869, 31218),   5 },
       },
       {
-        { AOM_CDF6(11553, 24088, 28463, 30245, 31254),   1 },
-        { AOM_CDF6(    4, 17370, 25445, 29140, 30587),   1 },
+        { AOM_CDF6(12447, 24328, 28566, 30469, 31468),   1 },
+        { AOM_CDF6(    4, 18559, 25929, 29452, 30837),   1 },
       },
       {
-        { AOM_CDF6( 7024, 15273, 21840, 25935, 28288),   0 },
-        { AOM_CDF6(    4,  7731, 17353, 23076, 27037),  16 },
+        { AOM_CDF6( 6059, 14350, 21101, 25538, 28284),   0 },
+        { AOM_CDF6(    4,  8626, 17947, 23810, 27621),   1 },
       },
       {
-        { AOM_CDF6( 3746,  9985, 15632, 20017, 23027),  75 },
-        { AOM_CDF6(    4,  6373, 11602, 17042, 21419),  80 },
+        { AOM_CDF6( 3725, 10288, 16087, 20666, 24016),  75 },
+        { AOM_CDF6(    4,  6533, 12288, 17848, 22413),  80 },
       },
       {
-        { AOM_CDF6( 2082,  7026, 11381, 14786, 17520),   0 },
-        { AOM_CDF6(    4,  4871,  9364, 13890, 17656), 115 },
+        { AOM_CDF6( 2171,  7502, 12172, 15887, 19156),   0 },
+        { AOM_CDF6(    7,  5094,  9919, 14712, 18887),  90 },
       },
       {
-        { AOM_CDF6( 2087,  6015,  9380, 12730, 15665), 100 },
-        { AOM_CDF6(    4,  3918,  7711, 11351, 14541), 100 },
+        { AOM_CDF6( 2182,  6455, 10199, 13836, 17142),  75 },
+        { AOM_CDF6(    4,  4141,  8300, 12354, 15957),  75 },
       },
       {
-        { AOM_CDF6( 1341,  4509,  7293,  9812, 12372),  75 },
-        { AOM_CDF6(  256,  2590,  5623,  9095, 11636),   0 },
+        { AOM_CDF6( 1639,  5232,  8372, 11445, 14349),  75 },
+        { AOM_CDF6(   10,  3077,  6545, 10446, 13509),   0 },
       },
       {
-        { AOM_CDF6(  976,  3688,  5636,  8039,  9715), 105 },
-        { AOM_CDF6(  687,  1620,  3367,  5293,  6811),  20 },
+        { AOM_CDF6( 1084,  4304,  6721,  9558, 11647),  75 },
+        { AOM_CDF6(  545,  1846,  4045,  6508,  8619),  15 },
       },
       {
-        { AOM_CDF6(28887, 32555, 32681, 32736, 32740),  86 },
-        { AOM_CDF6(24226, 25856, 32179, 32602, 32696),  91 },
+        { AOM_CDF6(24344, 31910, 32550, 32682, 32732),  86 },
+        { AOM_CDF6(26511, 26812, 32257, 32605, 32732),   6 },
       },
       {
-        { AOM_CDF6(12303, 28716, 32009, 32572, 32656),  76 },
-        { AOM_CDF6(    4, 24146, 30930, 32278, 32584),  76 },
+        { AOM_CDF6(11758, 27192, 31302, 32386, 32693),  76 },
+        { AOM_CDF6(    4, 22871, 30546, 32311, 32672),  76 },
       },
       {
-        { AOM_CDF6(15354, 28286, 31174, 32271, 32471),   1 },
-        { AOM_CDF6(    4, 22931, 29154, 31249, 32097),   5 },
+        { AOM_CDF6(14135, 26534, 30495, 32044, 32475),   1 },
+        { AOM_CDF6(    4, 20045, 27213, 30377, 31787),   5 },
       },
       {
-        { AOM_CDF6( 8069, 19928, 26367, 29511, 31034),  78 },
-        { AOM_CDF6(    4, 14000, 23263, 28180, 30447),   0 },
+        { AOM_CDF6( 7076, 18263, 25043, 28687, 30681),  78 },
+        { AOM_CDF6(    4, 13464, 22336, 27466, 30144),   0 },
       },
       {
-        { AOM_CDF6( 4893, 14615, 22005, 26172, 28105),  90 },
-        { AOM_CDF6(   22,  8940, 16767, 22484, 26784),  90 },
+        { AOM_CDF6( 4633, 13655, 20720, 25269, 27732),  90 },
+        { AOM_CDF6(    4,  8679, 16355, 22272, 26693),  90 },
       },
       {
-        { AOM_CDF6( 3896, 11404, 17690, 22419, 25421), 100 },
-        { AOM_CDF6(    4,  7262, 13989, 19525, 23762),  90 },
+        { AOM_CDF6( 3748, 10999, 17182, 22075, 25415),  75 },
+        { AOM_CDF6(    4,  7508, 14197, 19726, 24108),  90 },
       },
       {
-        { AOM_CDF6( 2008,  7092, 11478, 15543, 18272),  75 },
-        { AOM_CDF6(  524,  5359,  9988, 13990, 17384),  76 },
+        { AOM_CDF6( 2184,  7460, 12244, 16404, 19473),  75 },
+        { AOM_CDF6(   69,  5366, 10343, 14774, 18517),  76 },
       },
       {
-        { AOM_CDF6(27048, 32468, 32715, 32736, 32740),  90 },
-        { AOM_CDF6( 5312, 31067, 32652, 32736, 32740),  75 },
+        { AOM_CDF6(25069, 32379, 32715, 32736, 32740),  90 },
+        { AOM_CDF6( 5129, 30522, 32636, 32736, 32740),  75 },
       },
       {
-        { AOM_CDF6(19326, 30997, 32564, 32716, 32732),  75 },
-        { AOM_CDF6(   35, 27721, 32232, 32660, 32719),   0 },
+        { AOM_CDF6(19064, 30841, 32497, 32710, 32732),  75 },
+        { AOM_CDF6(    4, 27337, 32042, 32655, 32732),   0 },
       },
       {
-        { AOM_CDF6(16626, 29282, 32015, 32591, 32677),   0 },
-        { AOM_CDF6(  158, 24544, 30759, 32284, 32576),   0 },
+        { AOM_CDF6(15344, 28138, 31636, 32491, 32707),   0 },
+        { AOM_CDF6(   10, 23734, 30387, 32192, 32638),   0 },
       },
       {
-        { AOM_CDF6( 9045, 22277, 28749, 31356, 32195),  93 },
-        { AOM_CDF6(   62, 16924, 26769, 30712, 32049),  75 },
+        { AOM_CDF6( 8553, 21612, 28244, 31035, 32141),  93 },
+        { AOM_CDF6(    4, 16669, 26367, 30466, 32062),  75 },
       },
       {
-        { AOM_CDF6( 4870, 14063, 21039, 25691, 28445),  75 },
-        { AOM_CDF6(   65,  9937, 18152, 23756, 27274),  75 },
+        { AOM_CDF6( 4707, 13756, 20729, 25449, 28537),  75 },
+        { AOM_CDF6(    9,  9798, 18016, 23799, 27538),  75 },
       },
       {
-        { AOM_CDF6(31190, 32623, 32728, 32736, 32740),  75 },
-        { AOM_CDF6(31190, 32623, 32728, 32736, 32740),  75 },
+        { AOM_CDF6(30472, 32430, 32636, 32704, 32730),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(17296, 30538, 32283, 32595, 32679), 115 },
-        { AOM_CDF6(17296, 30538, 32283, 32595, 32679), 115 },
+        { AOM_CDF6(16740, 29432, 31724, 32306, 32530),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 9855, 23676, 29421, 31444, 32139),  90 },
-        { AOM_CDF6( 9855, 23676, 29421, 31444, 32139),  90 },
+        { AOM_CDF6( 9770, 21395, 26819, 29645, 31040),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 5610, 15572, 23067, 27145, 29141),  75 },
-        { AOM_CDF6( 5610, 15572, 23067, 27145, 29141),  75 },
+        { AOM_CDF6( 5883, 13836, 19460, 22882, 25424),   6 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 3359, 10455, 17462, 22799, 26242),  75 },
-        { AOM_CDF6( 3359, 10455, 17462, 22799, 26242),  75 },
+        { AOM_CDF6( 3255,  9742, 15113, 19977, 23209),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2562,  7733, 13030, 18172, 22037),  95 },
-        { AOM_CDF6( 2562,  7733, 13030, 18172, 22037),  95 },
+        { AOM_CDF6( 2318,  6734, 11462, 15492, 18969),  91 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1533,  4582,  7815, 11120, 14554),   8 },
-        { AOM_CDF6( 1533,  4582,  7815, 11120, 14554),   8 },
+        { AOM_CDF6( 1344,  4886,  8490, 11147, 13803),   1 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(31894, 32738, 32742, 32746, 32750),   0 },
-        { AOM_CDF6(31894, 32738, 32742, 32746, 32750),   0 },
+        { AOM_CDF6(31970, 32735, 32740, 32744, 32748),  15 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(20885, 31806, 32640, 32734, 32738), 118 },
-        { AOM_CDF6(20885, 31806, 32640, 32734, 32738), 118 },
+        { AOM_CDF6(21766, 31615, 32549, 32682, 32732),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(12973, 27352, 31367, 32350, 32605), 100 },
-        { AOM_CDF6(12973, 27352, 31367, 32350, 32605), 100 },
+        { AOM_CDF6(14071, 27537, 31162, 32180, 32564),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 8298, 21287, 28025, 30769, 31890),  91 },
-        { AOM_CDF6( 8298, 21287, 28025, 30769, 31890),  91 },
+        { AOM_CDF6( 9394, 22451, 28320, 30624, 31619),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 4886, 13785, 20958, 25454, 28197),  76 },
-        { AOM_CDF6( 4886, 13785, 20958, 25454, 28197),  76 },
+        { AOM_CDF6( 6357, 16098, 22083, 26080, 28701),  76 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
     },
     {
       {
-        { AOM_CDF6(18369, 28750, 30767, 31679, 31962),  32 },
-        { AOM_CDF6(11235, 21533, 28087, 29491, 30427),  50 },
+        { AOM_CDF6(22670, 31040, 32062, 32396, 32494),  62 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 5658, 17658, 24620, 28977, 30879),   1 },
-        { AOM_CDF6(    4, 11402, 22885, 28559, 30692),  15 },
+        { AOM_CDF6( 6204, 18887, 26106, 29994, 31527),   1 },
+        { AOM_CDF6(    4, 13216, 24238, 29218, 31178),   0 },
       },
       {
-        { AOM_CDF6(10074, 22055, 27447, 29607, 31031),  25 },
-        { AOM_CDF6(    4, 18604, 26012, 28842, 30041),  26 },
+        { AOM_CDF6(10730, 22881, 27929, 30084, 31344),  25 },
+        { AOM_CDF6(    4, 18763, 26180, 29027, 30353),  26 },
       },
       {
-        { AOM_CDF6( 4255, 14456, 19489, 24335, 27001),   6 },
-        { AOM_CDF6(    4,  9669, 17146, 23378, 26599),   0 },
+        { AOM_CDF6( 4419, 14204, 19910, 24823, 27593),   6 },
+        { AOM_CDF6(    4,  9746, 17528, 23820, 27251),   0 },
       },
       {
-        { AOM_CDF6( 3095,  7838, 13438, 17076, 20209),  31 },
-        { AOM_CDF6(    4,  6699, 12805, 17939, 22481), 100 },
+        { AOM_CDF6( 3252,  8648, 14582, 18530, 21957),  31 },
+        { AOM_CDF6(    4,  6941, 13319, 18486, 23105),  75 },
       },
       {
-        { AOM_CDF6( 1907,  8481, 12666, 15353, 18350),  75 },
-        { AOM_CDF6( 1534,  4650,  8748, 14149, 18320),   0 },
+        { AOM_CDF6( 2193,  8919, 13231, 16176, 19402),  75 },
+        { AOM_CDF6(  957,  4227,  8679, 14052, 18540),   0 },
       },
       {
-        { AOM_CDF6(  899,  4980,  8076, 11175, 13025),  26 },
-        { AOM_CDF6( 1198,  4437,  8203, 12605, 16331),  75 },
+        { AOM_CDF6( 1055,  5756,  9129, 12574, 14838),  26 },
+        { AOM_CDF6(  822,  4183,  8160, 12989, 16983),  75 },
       },
       {
-        { AOM_CDF6( 1921,  7069, 11605, 15583, 18257), 100 },
-        { AOM_CDF6( 1090,  1427,  3417,  4036,  5950),  26 },
+        { AOM_CDF6( 2072,  7295, 11937, 15990, 18808),  90 },
+        { AOM_CDF6( 1296,  1658,  4422,  5572,  8265),  26 },
       },
       {
-        { AOM_CDF6( 1550,  4215,  7211,  9789, 11281),   0 },
-        { AOM_CDF6(    6,  1331,  2225,  3502,  4755),  75 },
+        { AOM_CDF6( 1733,  4681,  7680, 10654, 12528),  75 },
+        { AOM_CDF6(    4,  1678,  2994,  4855,  6537),  75 },
       },
       {
-        { AOM_CDF6(28052, 32262, 32618, 32709, 32732),   6 },
-        { AOM_CDF6( 9595, 28065, 32429, 32683, 32732),  12 },
+        { AOM_CDF6(24889, 31894, 32576, 32692, 32732),   6 },
+        { AOM_CDF6( 7489, 28023, 32440, 32702, 32732),  12 },
       },
       {
-        { AOM_CDF6(14331, 29666, 32065, 32556, 32672),   2 },
-        { AOM_CDF6(   14, 26353, 31293, 32488, 32668),   5 },
+        { AOM_CDF6(13420, 28082, 31481, 32420, 32693),   2 },
+        { AOM_CDF6(    4, 24196, 30708, 32346, 32682),   5 },
       },
       {
-        { AOM_CDF6(15089, 27195, 30928, 32030, 32402),   5 },
-        { AOM_CDF6(    7, 23017, 29417, 31412, 32197),   5 },
+        { AOM_CDF6(14158, 26101, 30271, 31760, 32366),   5 },
+        { AOM_CDF6(    4, 20337, 27469, 30511, 31808),   5 },
       },
       {
-        { AOM_CDF6( 7753, 19265, 26158, 29666, 30969),  15 },
-        { AOM_CDF6(   42, 15833, 24498, 28601, 30566),   0 },
+        { AOM_CDF6( 6545, 17433, 24600, 28570, 30488),  15 },
+        { AOM_CDF6(    4, 14301, 23067, 27600, 30048),   0 },
       },
       {
-        { AOM_CDF6( 4879, 13241, 20168, 24896, 27798),  75 },
-        { AOM_CDF6(   13,  9232, 17012, 22633, 26646),  90 },
+        { AOM_CDF6( 4611, 12681, 19425, 24119, 27368),  75 },
+        { AOM_CDF6(    6,  8765, 16411, 22190, 26422),  90 },
       },
       {
-        { AOM_CDF6( 3212, 10660, 16186, 21879, 23748),  25 },
-        { AOM_CDF6(  224,  7767, 15065, 19540, 23626),  75 },
+        { AOM_CDF6( 3293, 10520, 16126, 21429, 23703),   0 },
+        { AOM_CDF6(   13,  7300, 14277, 19168, 23448),  75 },
       },
       {
-        { AOM_CDF6( 2415,  7154, 11280, 14840, 17255),  75 },
-        { AOM_CDF6(  347,  3747,  7551, 11144, 14391),   0 },
+        { AOM_CDF6( 2464,  7343, 11864, 15738, 18418),  90 },
+        { AOM_CDF6(   85,  4192,  8349, 12391, 15795),   0 },
       },
       {
-        { AOM_CDF6(26824, 32497, 32740, 32744, 32748),   0 },
-        { AOM_CDF6( 4927, 31928, 32702, 32736, 32740),  76 },
+        { AOM_CDF6(26166, 32502, 32728, 32736, 32740),   0 },
+        { AOM_CDF6( 4561, 31126, 32673, 32736, 32740),  76 },
       },
       {
-        { AOM_CDF6(20714, 31285, 32541, 32722, 32732),  75 },
-        { AOM_CDF6(  141, 28731, 32423, 32683, 32732),   1 },
+        { AOM_CDF6(19676, 30981, 32490, 32712, 32732),  75 },
+        { AOM_CDF6(    5, 27917, 32248, 32677, 32732),   1 },
       },
       {
-        { AOM_CDF6(16966, 29936, 32293, 32637, 32698),   1 },
-        { AOM_CDF6(  333, 24800, 30741, 32242, 32573),  80 },
+        { AOM_CDF6(15573, 28642, 31918, 32572, 32718),   1 },
+        { AOM_CDF6(   33, 24002, 30459, 32142, 32635),  80 },
       },
       {
-        { AOM_CDF6( 9428, 23165, 29520, 31725, 32322),  76 },
-        { AOM_CDF6(  183, 17188, 26499, 30397, 31890),  80 },
+        { AOM_CDF6( 8718, 22161, 28870, 31388, 32324),  76 },
+        { AOM_CDF6(   37, 17061, 26380, 30433, 31990),  75 },
       },
       {
-        { AOM_CDF6( 4433, 12770, 19162, 23467, 26183),  80 },
-        { AOM_CDF6(  239,  8770, 16053, 21208, 24514),  80 },
+        { AOM_CDF6( 4574, 13326, 20007, 24664, 27510),  75 },
+        { AOM_CDF6(   75,  9240, 17009, 22503, 26129),  80 },
       },
       {
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
@@ -5500,88 +5500,88 @@
     },
     {
       {
-        { AOM_CDF6(18220, 27817, 29642, 30638, 31232),  62 },
-        { AOM_CDF6( 1170, 21455, 26917, 30818, 31988),  50 },
+        { AOM_CDF6(15828, 27456, 29866, 30952, 31512),  62 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 3891, 15848, 22851, 27994, 29793),   5 },
-        { AOM_CDF6(    4,  9572, 22857, 27471, 30250),   6 },
+        { AOM_CDF6( 4322, 17878, 25258, 29337, 30946),  31 },
+        { AOM_CDF6(    4, 11985, 23302, 27957, 30495),   6 },
       },
       {
-        { AOM_CDF6( 8542, 20260, 25710, 28676, 30426),   1 },
-        { AOM_CDF6(    4, 16305, 22090, 27076, 29048),   7 },
+        { AOM_CDF6( 9877, 22124, 26984, 29481, 30923),   1 },
+        { AOM_CDF6(    4, 18007, 23542, 27862, 29724),   7 },
       },
       {
-        { AOM_CDF6( 4585, 16828, 20728, 22695, 24948),   6 },
-        { AOM_CDF6( 1694,  5176, 14173, 20427, 24734),  31 },
+        { AOM_CDF6( 4896, 15934, 20448, 22985, 25552),   6 },
+        { AOM_CDF6(  882,  5246, 14586, 20929, 25166),  31 },
       },
       {
-        { AOM_CDF6( 2914, 12533, 16153, 19908, 21920),   1 },
-        { AOM_CDF6(  205,  5047,  7747, 14490, 19383),   1 },
+        { AOM_CDF6( 2897, 11697, 15855, 19987, 22265),   1 },
+        { AOM_CDF6(    4,  5352,  8285, 14883, 19798),   1 },
       },
       {
-        { AOM_CDF6( 2733,  7494, 11642, 15790, 18460),   0 },
-        { AOM_CDF6(    4,  4288,  8809, 11860, 14604),   0 },
+        { AOM_CDF6( 2550,  7215, 11328, 15219, 17984),   3 },
+        { AOM_CDF6(    4,  4270,  8893, 12038, 15001),  18 },
       },
       {
-        { AOM_CDF6( 1920,  6130, 10679, 13827, 15622),   0 },
-        { AOM_CDF6(  337,  2970,  5839,  8292, 11888),   1 },
+        { AOM_CDF6( 1976,  5938, 10048, 13248, 15220),   1 },
+        { AOM_CDF6(   74,  2872,  5881,  8719, 12203),   3 },
       },
       {
-        { AOM_CDF6( 1370,  4921,  7259,  9478, 11706),  15 },
-        { AOM_CDF6(  622,  3070,  5927,  9122, 12000),  15 },
+        { AOM_CDF6( 1557,  5182,  7687, 10041, 12530),  18 },
+        { AOM_CDF6(  302,  3173,  6064,  9146, 12139),  16 },
       },
       {
-        { AOM_CDF6(  806,  2086,  3484,  5269,  6034),  75 },
-        { AOM_CDF6(  425,  1430,  3548,  4874,  6064),  75 },
+        { AOM_CDF6( 1041,  2835,  4612,  6619,  7701),  75 },
+        { AOM_CDF6(  284,  1622,  3979,  5622,  7317),  75 },
       },
       {
-        { AOM_CDF6(27172, 32021, 32535, 32721, 32732),  32 },
-        { AOM_CDF6( 6700, 28268, 32266, 32682, 32726),   1 },
+        { AOM_CDF6(23459, 31826, 32523, 32706, 32732),  32 },
+        { AOM_CDF6( 4370, 28739, 32302, 32698, 32732),  30 },
       },
       {
-        { AOM_CDF6(14033, 28608, 31937, 32516, 32666),   0 },
-        { AOM_CDF6(    5, 25162, 30887, 32200, 32541),   1 },
+        { AOM_CDF6(14211, 27544, 31308, 32252, 32647),   0 },
+        { AOM_CDF6(    4, 24453, 30550, 32209, 32593),   1 },
       },
       {
-        { AOM_CDF6(13870, 26890, 30545, 31882, 32345),   1 },
-        { AOM_CDF6(   39, 21623, 28581, 31009, 32019),   6 },
+        { AOM_CDF6(13549, 26000, 29944, 31604, 32248),   1 },
+        { AOM_CDF6(    4, 19875, 26915, 30003, 31480),   6 },
       },
       {
-        { AOM_CDF6( 7662, 21491, 27056, 29892, 31051),   1 },
-        { AOM_CDF6( 2510, 10777, 20599, 26536, 29402),   1 },
+        { AOM_CDF6( 6688, 18459, 24591, 28101, 29825),   1 },
+        { AOM_CDF6(  956, 10175, 19300, 25085, 28308),   1 },
       },
       {
-        { AOM_CDF6( 4480, 13687, 19862, 23836, 26585),   0 },
-        { AOM_CDF6(    9,  8613, 15756, 21761, 25473),   0 },
+        { AOM_CDF6( 4149, 12273, 18024, 22204, 25189),   0 },
+        { AOM_CDF6(    4,  7907, 14615, 20513, 24277),   0 },
       },
       {
-        { AOM_CDF6( 3242,  9810, 14940, 19815, 22853),   0 },
-        { AOM_CDF6( 1766,  6619, 13390, 18348, 22410),   1 },
+        { AOM_CDF6( 3084,  9362, 14515, 19060, 22086),   0 },
+        { AOM_CDF6(  881,  5812, 11992, 16891, 21229),   1 },
       },
       {
-        { AOM_CDF6( 2348,  5889,  8839, 12121, 13993),  75 },
-        { AOM_CDF6(  121,  2095,  5699,  8594, 10331),  26 },
+        { AOM_CDF6( 2270,  6094,  9436, 13046, 15065),  90 },
+        { AOM_CDF6(    4,  2628,  6124,  9042, 11413),   1 },
       },
       {
-        { AOM_CDF6(28278, 32642, 32740, 32744, 32748),  31 },
-        { AOM_CDF6( 9278, 31654, 32709, 32736, 32740),  81 },
+        { AOM_CDF6(26213, 32584, 32715, 32736, 32740),  31 },
+        { AOM_CDF6( 9595, 31175, 32663, 32736, 32740),  81 },
       },
       {
-        { AOM_CDF6(19933, 31040, 32461, 32697, 32732),  80 },
-        { AOM_CDF6(  278, 29000, 32281, 32678, 32730),   1 },
+        { AOM_CDF6(19100, 30551, 32351, 32675, 32732),  80 },
+        { AOM_CDF6(   42, 27427, 31958, 32640, 32732),   1 },
       },
       {
-        { AOM_CDF6(16199, 28568, 31564, 32374, 32586),  75 },
-        { AOM_CDF6(  393, 25547, 31051, 32294, 32586),  81 },
+        { AOM_CDF6(14907, 27403, 31007, 32163, 32585),   0 },
+        { AOM_CDF6(   74, 23383, 30040, 31948, 32492),   6 },
       },
       {
-        { AOM_CDF6( 9057, 23326, 28792, 31102, 32035),   1 },
-        { AOM_CDF6( 1317, 17380, 26498, 30264, 31685),   1 },
+        { AOM_CDF6( 8140, 21140, 27523, 30537, 31800),   1 },
+        { AOM_CDF6(  601, 15748, 25003, 29331, 31277),   1 },
       },
       {
-        { AOM_CDF6( 3381, 10098, 15426, 19504, 22173),  75 },
-        { AOM_CDF6(  458,  7020, 13130, 17600, 20791),  75 },
+        { AOM_CDF6( 3878, 11230, 17295, 21736, 24654),  75 },
+        { AOM_CDF6(  267,  7839, 14608, 19822, 23499),  75 },
       },
       {
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
@@ -5636,32 +5636,28 @@
   {
     {
       {
-        { AOM_CDF6( 4681, 14043, 18725, 23406, 28087),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(  103, 11271, 26838, 30664, 32076),   1 },
-        { AOM_CDF6(    4,  6418, 20098, 27848, 30875),   1 },
+        { AOM_CDF6(  100, 16721, 28276, 31260, 32398),   1 },
+        { AOM_CDF6(    4,  6986, 23211, 29768, 31892),   1 },
       },
       {
-        { AOM_CDF6( 4587, 16793, 22808, 28242, 31144),  80 },
-        { AOM_CDF6(   10, 19684, 25353, 28286, 31126),  27 },
+        { AOM_CDF6( 6124, 20746, 26659, 30297, 32090),  80 },
+        { AOM_CDF6(    4, 20450, 26906, 29984, 32052),  42 },
       },
       {
-        { AOM_CDF6( 2377,  8011, 16642, 27160, 30985),   2 },
-        { AOM_CDF6( 3228,  3851, 16419, 26311, 27649),  12 },
+        { AOM_CDF6( 2483,  9881, 20654, 28573, 31617),   7 },
+        { AOM_CDF6( 4478,  5170, 20007, 29247, 31101),  12 },
       },
       {
-        { AOM_CDF6( 5056, 11235, 16478, 19099, 27900),   9 },
-        { AOM_CDF6(  410,  9830, 12698, 18022, 22118),  15 },
+        { AOM_CDF6( 4402, 12594, 21642, 24821, 29711),  60 },
+        { AOM_CDF6(  119, 12229, 15790, 22676, 27425),  28 },
       },
       {
-        { AOM_CDF6( 4681,  9362, 10923, 17164, 20285), 100 },
-        { AOM_CDF6( 5461,  8192, 13653, 19115, 27307), 100 },
-      },
-      {
-        { AOM_CDF6( 9362, 14043, 18725, 23406, 28087),   0 },
-        { AOM_CDF6( 4681,  9362, 14043, 18725, 23406),   0 },
+        { AOM_CDF6( 5174, 12072, 22420, 24145, 25869),   0 },
+        { AOM_CDF6(  728,  2913,  5825, 21117, 22574),  90 },
       },
       {
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
@@ -5672,27 +5668,31 @@
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(19256, 30277, 32446, 32709, 32732),  31 },
-        { AOM_CDF6( 3451, 24556, 32425, 32736, 32740),  31 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 7962, 30736, 32423, 32723, 32732),  18 },
-        { AOM_CDF6(   20, 19022, 30515, 32657, 32732),   0 },
+        { AOM_CDF6(18225, 31062, 32659, 32736, 32740),  31 },
+        { AOM_CDF6(  747, 25457, 32313, 32736, 32740),  43 },
       },
       {
-        { AOM_CDF6(14671, 31018, 32209, 32545, 32731),   1 },
-        { AOM_CDF6(  146, 25519, 31340, 32292, 32658),  37 },
+        { AOM_CDF6( 9428, 30477, 32339, 32668, 32696),  18 },
+        { AOM_CDF6(    4, 21160, 31076, 32661, 32732),   0 },
       },
       {
-        { AOM_CDF6(10448, 24695, 31106, 32056, 32293),  20 },
-        { AOM_CDF6( 4551, 16384, 28217, 30644, 32465),  35 },
+        { AOM_CDF6(14256, 29803, 32043, 32616, 32732),  75 },
+        { AOM_CDF6(   10, 23629, 31540, 32549, 32730),  32 },
       },
       {
-        { AOM_CDF6( 5461, 19115, 21845, 24576, 27307), 100 },
-        { AOM_CDF6( 4681, 14043, 25746, 28087, 30427), 100 },
+        { AOM_CDF6( 8535, 25300, 30787, 31549, 32463),  85 },
+        { AOM_CDF6( 1351, 18749, 29052, 31248, 32599),  90 },
       },
       {
-        { AOM_CDF6( 4681,  9362, 18725, 23406, 28087),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 3855,  9638, 17348, 19275, 23130),  50 },
+      },
+      {
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
@@ -5700,426 +5700,426 @@
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(19246, 32462, 32666, 32734, 32738),   0 },
-        { AOM_CDF6(12369, 30212, 32735, 32739, 32743),  83 },
+        { AOM_CDF6(20884, 32507, 32740, 32744, 32748),  15 },
+        { AOM_CDF6(11439, 30717, 32718, 32736, 32740),  83 },
       },
       {
-        { AOM_CDF6(14644, 31985, 32623, 32681, 32732),  16 },
-        { AOM_CDF6( 5146, 29315, 32442, 32670, 32732),   5 },
+        { AOM_CDF6(16651, 32234, 32676, 32736, 32740),  15 },
+        { AOM_CDF6( 2783, 29097, 32503, 32736, 32740),  80 },
       },
       {
-        { AOM_CDF6(13473, 29774, 32103, 32435, 32602),  35 },
-        { AOM_CDF6( 3277, 23101, 30966, 32276, 32604),  50 },
+        { AOM_CDF6(14119, 29823, 32164, 32617, 32692),  12 },
+        { AOM_CDF6( 2682, 23298, 31008, 32517, 32684),  88 },
       },
       {
-        { AOM_CDF6( 8623, 20696, 25869, 29319, 31043),  50 },
-        { AOM_CDF6( 2185, 15292, 24030, 28399, 30583),  50 },
+        { AOM_CDF6(10503, 29407, 31508, 31928, 32348),  25 },
+        { AOM_CDF6(  886, 19484, 30111, 30997, 31882),  75 },
       },
       {
-        { AOM_CDF6( 4681, 14043, 18725, 23406, 28087),   0 },
-        { AOM_CDF6( 4681,  9362, 18725, 23406, 28087),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(27523, 31549, 32239, 32557, 32644),  99 },
-        { AOM_CDF6(27523, 31549, 32239, 32557, 32644),  99 },
+        { AOM_CDF6(29595, 31985, 32553, 32665, 32732),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(13891, 26332, 30540, 31905, 32545),  15 },
-        { AOM_CDF6(13891, 26332, 30540, 31905, 32545),  15 },
+        { AOM_CDF6(16090, 27467, 31184, 32157, 32704),   1 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 9368, 19790, 26821, 30278, 31710),  42 },
-        { AOM_CDF6( 9368, 19790, 26821, 30278, 31710),  42 },
+        { AOM_CDF6(11881, 22576, 26436, 31160, 32105),  27 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 7770, 17585, 24454, 27851, 29822),  50 },
-        { AOM_CDF6( 7770, 17585, 24454, 27851, 29822),  50 },
+        { AOM_CDF6( 4886, 21845, 24001, 27882, 28169),  60 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2731,  8548, 14128, 22439, 25882),   0 },
-        { AOM_CDF6( 2731,  8548, 14128, 22439, 25882),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(  520,  7282, 12483, 20285, 23406),   0 },
-        { AOM_CDF6(  520,  7282, 12483, 20285, 23406),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1638, 11469, 14746, 16384, 19661),   0 },
-        { AOM_CDF6( 1638, 11469, 14746, 16384, 19661),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(30430, 32574, 32740, 32744, 32748),  41 },
-        { AOM_CDF6(30430, 32574, 32740, 32744, 32748),  41 },
+        { AOM_CDF6(29540, 32735, 32740, 32744, 32748),   6 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(19285, 29197, 32409, 32731, 32735),  19 },
-        { AOM_CDF6(19285, 29197, 32409, 32731, 32735),  19 },
+        { AOM_CDF6(21479, 29463, 32511, 32736, 32740),  93 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(13323, 25054, 30001, 31837, 32425),  25 },
-        { AOM_CDF6(13323, 25054, 30001, 31837, 32425),  25 },
+        { AOM_CDF6(15056, 26273, 29816, 32178, 32473),  25 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(10464, 17623, 22855, 28913, 31667),   0 },
-        { AOM_CDF6(10464, 17623, 22855, 28913, 31667),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 5461, 16384, 21845, 25122, 29491),   0 },
-        { AOM_CDF6( 5461, 16384, 21845, 25122, 29491),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
     },
     {
       {
-        { AOM_CDF6( 6656, 28025, 30549, 32028, 32513),   9 },
-        { AOM_CDF6( 5041, 10082, 17644, 20165, 27727),   0 },
+        { AOM_CDF6(10519, 30400, 31391, 32327, 32713),  15 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(  279, 20342, 28831, 31316, 32156),   0 },
-        { AOM_CDF6(    4,  5222, 23131, 29232, 31279),   0 },
+        { AOM_CDF6(   86, 20785, 28528, 31103, 32087),   0 },
+        { AOM_CDF6(    4,  6067, 24484, 29795, 31615),   0 },
       },
       {
-        { AOM_CDF6( 9562, 18247, 25664, 29587, 30939),   0 },
-        { AOM_CDF6(    4, 13602, 25267, 28755, 30693),   1 },
+        { AOM_CDF6(10869, 20589, 26954, 30327, 31505),   0 },
+        { AOM_CDF6(    4, 15477, 26105, 29564, 31257),   1 },
       },
       {
-        { AOM_CDF6( 4293, 14308, 21667, 26856, 29719),   0 },
-        { AOM_CDF6(    4,  9398, 17200, 24012, 27811),  15 },
+        { AOM_CDF6( 4914, 15045, 23040, 27717, 30490),   0 },
+        { AOM_CDF6(    4, 10307, 19393, 25816, 29383),  15 },
       },
       {
-        { AOM_CDF6( 2096,  9179, 15466, 21307, 25525),  75 },
-        { AOM_CDF6( 3678,  6848, 13812, 19976, 23634),   0 },
+        { AOM_CDF6( 2819, 10379, 17295, 23231, 27208),  75 },
+        { AOM_CDF6( 2939,  6238, 14472, 21322, 25358),   1 },
       },
       {
-        { AOM_CDF6( 2093,  7368, 12031, 17663, 22850),  96 },
-        { AOM_CDF6(    4,  5580, 11201, 13997, 19937),   1 },
+        { AOM_CDF6( 2510,  8572, 13721, 19650, 24615),  91 },
+        { AOM_CDF6(    4,  6558, 12858, 16531, 22847),   1 },
       },
       {
-        { AOM_CDF6( 2403,  7524, 10107, 15168, 19192),   1 },
-        { AOM_CDF6(  390,  3333,  8138, 13419, 17675),  75 },
+        { AOM_CDF6( 2098,  8373, 11493, 16534, 21082),  10 },
+        { AOM_CDF6(  371,  3300,  8699, 14469, 19163),  76 },
       },
       {
-        { AOM_CDF6( 1438,  5212,  8806, 12640, 17612),  95 },
-        { AOM_CDF6( 2950,  3076,  7910, 11802, 16384),  22 },
+        { AOM_CDF6( 1409,  6107,  9513, 13859, 18674),  40 },
+        { AOM_CDF6( 1882,  3210,  8081, 12842, 17048),  85 },
       },
       {
-        { AOM_CDF6( 2048,  6400,  7680,  9472, 12288), 100 },
-        { AOM_CDF6( 2712,  3390,  6102, 10169, 13559),  75 },
+        { AOM_CDF6(  780,  5461,  7802, 10923, 13263),   0 },
+        { AOM_CDF6(  537,  4835,  8058, 10744, 13967),  90 },
       },
       {
-        { AOM_CDF6(22013, 32196, 32686, 32736, 32740),  19 },
-        { AOM_CDF6(25440, 27016, 32521, 32717, 32732),  31 },
+        { AOM_CDF6(21042, 31954, 32667, 32736, 32740),  18 },
+        { AOM_CDF6(28136, 28288, 32626, 32720, 32732),  57 },
       },
       {
-        { AOM_CDF6( 7585, 28552, 31957, 32673, 32724),  78 },
-        { AOM_CDF6(    4, 22111, 31096, 32550, 32696),   1 },
+        { AOM_CDF6( 7851, 28094, 31782, 32677, 32732),  78 },
+        { AOM_CDF6(    4, 21935, 31329, 32631, 32732),   1 },
       },
       {
-        { AOM_CDF6(12055, 26278, 30763, 32298, 32561),  90 },
-        { AOM_CDF6(    4, 20893, 29384, 31964, 32534),   0 },
+        { AOM_CDF6(12762, 26468, 31109, 32414, 32693),  90 },
+        { AOM_CDF6(    4, 21556, 29551, 32049, 32643),   0 },
       },
       {
-        { AOM_CDF6( 9942, 22699, 28956, 31224, 32218),  90 },
-        { AOM_CDF6(    4, 15990, 26096, 30521, 32102),   0 },
+        { AOM_CDF6(10020, 22866, 29258, 31456, 32395),  90 },
+        { AOM_CDF6(    4, 17576, 27446, 31017, 32403),   0 },
       },
       {
-        { AOM_CDF6( 7289, 19148, 26592, 30466, 31729),  90 },
-        { AOM_CDF6(   92, 11742, 22346, 28190, 30826),  90 },
+        { AOM_CDF6( 7348, 19414, 26844, 30566, 31941),  90 },
+        { AOM_CDF6(    4, 12308, 22780, 28574, 31279),  75 },
       },
       {
-        { AOM_CDF6( 6358, 17829, 23866, 28606, 30931),  78 },
-        { AOM_CDF6( 1898, 12645, 21679, 26717, 30071),   0 },
+        { AOM_CDF6( 6457, 17740, 24197, 28585, 30902),  78 },
+        { AOM_CDF6(  769, 11802, 20680, 26000, 30085),  15 },
       },
       {
-        { AOM_CDF6( 4002, 13924, 23096, 26431, 29683),  79 },
-        { AOM_CDF6(  324, 10139, 16708, 23116, 26523),  14 },
+        { AOM_CDF6( 4625, 14072, 20960, 25388, 28438),  40 },
+        { AOM_CDF6(  185,  8492, 16246, 20861, 25568),  90 },
       },
       {
-        { AOM_CDF6(25247, 32524, 32740, 32744, 32748),  75 },
-        { AOM_CDF6(12678, 31117, 32694, 32736, 32740),  75 },
+        { AOM_CDF6(24491, 32563, 32740, 32744, 32748),  90 },
+        { AOM_CDF6(10193, 31065, 32692, 32736, 32740),  75 },
       },
       {
-        { AOM_CDF6(17536, 31499, 32665, 32736, 32740),  78 },
-        { AOM_CDF6(   41, 27760, 32458, 32733, 32737),   0 },
+        { AOM_CDF6(18023, 31654, 32683, 32736, 32740),  78 },
+        { AOM_CDF6(    4, 28229, 32493, 32736, 32740),   0 },
       },
       {
-        { AOM_CDF6(14889, 29231, 32278, 32729, 32733),   3 },
-        { AOM_CDF6(   26, 24638, 31616, 32617, 32730),   0 },
+        { AOM_CDF6(15126, 29669, 32385, 32717, 32732),   3 },
+        { AOM_CDF6(    4, 25310, 31745, 32662, 32732),   0 },
       },
       {
-        { AOM_CDF6(11492, 26637, 31599, 32516, 32713),  90 },
-        { AOM_CDF6(  102, 20398, 30029, 32289, 32679),  75 },
+        { AOM_CDF6(11803, 26851, 31619, 32578, 32732),  90 },
+        { AOM_CDF6(    4, 21347, 30308, 32362, 32732),  75 },
       },
       {
-        { AOM_CDF6( 8508, 22676, 29590, 31571, 32464),  75 },
-        { AOM_CDF6( 1358, 16850, 27388, 31584, 32502),   1 },
+        { AOM_CDF6( 8413, 22123, 28902, 31454, 32484),  91 },
+        { AOM_CDF6(  533, 15815, 26833, 31091, 32338),   1 },
       },
       {
-        { AOM_CDF6(30812, 32458, 32672, 32720, 32732),   0 },
-        { AOM_CDF6(30812, 32458, 32672, 32720, 32732),   0 },
+        { AOM_CDF6(30851, 32572, 32702, 32736, 32740),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(14805, 28597, 31834, 32457, 32643),  75 },
-        { AOM_CDF6(14805, 28597, 31834, 32457, 32643),  75 },
+        { AOM_CDF6(15898, 29692, 32156, 32573, 32722),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 7885, 19026, 25996, 30110, 31734),  15 },
-        { AOM_CDF6( 7885, 19026, 25996, 30110, 31734),  15 },
+        { AOM_CDF6( 9275, 21031, 27592, 31095, 32259),  78 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 5016, 13942, 20823, 26044, 29114),   8 },
-        { AOM_CDF6( 5016, 13942, 20823, 26044, 29114),   8 },
+        { AOM_CDF6( 7586, 16864, 22782, 27672, 30277),  83 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1976,  6346, 13934, 19218, 24119),  85 },
-        { AOM_CDF6( 1976,  6346, 13934, 19218, 24119),  85 },
+        { AOM_CDF6( 4779, 14336, 21504, 25259, 27307),  25 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1964,  4548, 10578, 14265, 18951),   0 },
-        { AOM_CDF6( 1964,  4548, 10578, 14265, 18951),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1365,  4642,  7646, 12379, 15110),   0 },
-        { AOM_CDF6( 1365,  4642,  7646, 12379, 15110),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(31956, 32712, 32740, 32744, 32748),   3 },
-        { AOM_CDF6(31956, 32712, 32740, 32744, 32748),   3 },
+        { AOM_CDF6(32033, 32744, 32748, 32752, 32756),   3 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(21806, 31381, 32627, 32722, 32732),  75 },
-        { AOM_CDF6(21806, 31381, 32627, 32722, 32732),  75 },
+        { AOM_CDF6(21905, 31682, 32689, 32736, 32740),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(15258, 27788, 31399, 32476, 32692),  80 },
-        { AOM_CDF6(15258, 27788, 31399, 32476, 32692),  80 },
+        { AOM_CDF6(16223, 28310, 31943, 32665, 32704),   2 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(10991, 24246, 29922, 31791, 32374),  14 },
-        { AOM_CDF6(10991, 24246, 29922, 31791, 32374),  14 },
+        { AOM_CDF6(10587, 25458, 29995, 32012, 32516),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 7128, 19357, 26823, 30289, 31838),   0 },
-        { AOM_CDF6( 7128, 19357, 26823, 30289, 31838),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
     },
     {
       {
-        { AOM_CDF6(13826, 30096, 31508, 31995, 32431),  12 },
-        { AOM_CDF6(  364, 24030, 28035, 30948, 32040),  50 },
+        { AOM_CDF6(20744, 31573, 32432, 32575, 32732),  37 },
+        { AOM_CDF6( 2048, 24576, 26624, 28672, 30720),  50 },
       },
       {
-        { AOM_CDF6( 2024, 20665, 29011, 31585, 32126),  78 },
-        { AOM_CDF6(    4,  8009, 22643, 28090, 30886),  75 },
+        { AOM_CDF6( 1512, 20783, 28537, 31233, 32030),   0 },
+        { AOM_CDF6(    4,  9686, 25465, 29825, 31669),   0 },
       },
       {
-        { AOM_CDF6( 9042, 19748, 26650, 29420, 30908),   0 },
-        { AOM_CDF6(    4, 15104, 25370, 28952, 30726),   1 },
+        { AOM_CDF6(11418, 22879, 28443, 30589, 31691),   0 },
+        { AOM_CDF6(    4, 18611, 26971, 30180, 31489),   1 },
       },
       {
-        { AOM_CDF6( 5663, 14243, 20147, 25301, 28118),   3 },
-        { AOM_CDF6(    4,  8744, 17349, 24894, 28283),  77 },
+        { AOM_CDF6( 5931, 14893, 21314, 26301, 29130),   0 },
+        { AOM_CDF6(    4, 10485, 20060, 26727, 29964),   2 },
       },
       {
-        { AOM_CDF6( 4324, 10283, 15647, 20778, 24998),  90 },
-        { AOM_CDF6(  608,  3981, 12664, 18623, 22678),   6 },
+        { AOM_CDF6( 4511, 11376, 17124, 22328, 26530),  90 },
+        { AOM_CDF6(  109,  4550, 13218, 19861, 24578),   6 },
       },
       {
-        { AOM_CDF6( 2178,  8215, 12957, 17634, 21210),  75 },
-        { AOM_CDF6(    4,  4448,  9077, 14090, 18542), 100 },
+        { AOM_CDF6( 2402,  9192, 14384, 19305, 22990),  75 },
+        { AOM_CDF6(    4,  5323, 10546, 15982, 20848),  76 },
       },
       {
-        { AOM_CDF6( 2852,  7347, 11567, 15906, 18923),   0 },
-        { AOM_CDF6(    4,  3584,  8589, 12570, 15662), 100 },
+        { AOM_CDF6( 3030,  8069, 12594, 17208, 20711),   3 },
+        { AOM_CDF6(    4,  4225,  9697, 14319, 18246),  75 },
       },
       {
-        { AOM_CDF6( 2170,  5425,  8883, 11651, 16255),  75 },
-        { AOM_CDF6(  575,  2679,  6246,  9553, 12791),   3 },
+        { AOM_CDF6( 2223,  6369, 10286, 13595, 18323),  83 },
+        { AOM_CDF6(  175,  2961,  7374, 11755, 15610),   3 },
       },
       {
-        { AOM_CDF6( 1091,  4635,  7487, 10199, 11852),  94 },
-        { AOM_CDF6(  888,  2537,  6321,  9027, 12410),  94 },
+        { AOM_CDF6( 1367,  6180,  9659, 13156, 15544),  90 },
+        { AOM_CDF6(  505,  2440,  6344, 10284, 13648),  92 },
       },
       {
-        { AOM_CDF6(25512, 32470, 32602, 32710, 32732),   6 },
-        { AOM_CDF6(26203, 26914, 32437, 32680, 32727),   0 },
+        { AOM_CDF6(22323, 32120, 32586, 32723, 32732),   6 },
+        { AOM_CDF6(28677, 28707, 32573, 32736, 32740),  31 },
       },
       {
-        { AOM_CDF6( 7855, 28626, 32017, 32664, 32705),  90 },
-        { AOM_CDF6(    4, 24232, 31445, 32615, 32669),   6 },
+        { AOM_CDF6( 9067, 28461, 31803, 32646, 32732),  90 },
+        { AOM_CDF6(    4, 23713, 31500, 32628, 32732),   6 },
       },
       {
-        { AOM_CDF6(12772, 26369, 31001, 32261, 32532),  75 },
-        { AOM_CDF6(    4, 20769, 28386, 31339, 32286),   5 },
+        { AOM_CDF6(14440, 27462, 31270, 32400, 32671),  75 },
+        { AOM_CDF6(    4, 21690, 28829, 31630, 32453),   5 },
       },
       {
-        { AOM_CDF6( 7429, 20433, 27496, 30476, 31733),  98 },
-        { AOM_CDF6(  173, 15439, 24894, 29430, 31473),   5 },
+        { AOM_CDF6( 8061, 20968, 27850, 30659, 31948),  93 },
+        { AOM_CDF6(    4, 16746, 25908, 29977, 31832),   5 },
       },
       {
-        { AOM_CDF6( 5452, 15764, 23190, 27739, 30212),  95 },
-        { AOM_CDF6(   35, 10613, 20093, 26065, 29483),   5 },
+        { AOM_CDF6( 5820, 16451, 23783, 28293, 30655),  90 },
+        { AOM_CDF6(    4, 10996, 20608, 26697, 30042),   5 },
       },
       {
-        { AOM_CDF6( 4436, 13684, 19977, 24466, 28001), 100 },
-        { AOM_CDF6(   11, 10056, 17692, 23917, 28088),  75 },
+        { AOM_CDF6( 4853, 14377, 20953, 25793, 29037),  75 },
+        { AOM_CDF6(    4, 10112, 18364, 24708, 28619),  75 },
       },
       {
-        { AOM_CDF6( 3349, 10294, 16898, 22126, 25937),  75 },
-        { AOM_CDF6(   38,  7563, 15147, 20341, 24586), 100 },
+        { AOM_CDF6( 3528, 10929, 17584, 23009, 26629),  78 },
+        { AOM_CDF6(    5,  8177, 15921, 21527, 25499),  75 },
       },
       {
-        { AOM_CDF6(24231, 32550, 32740, 32744, 32748),   1 },
-        { AOM_CDF6(10035, 31049, 32696, 32736, 32740),  78 },
+        { AOM_CDF6(24757, 32619, 32740, 32744, 32748),   1 },
+        { AOM_CDF6( 8837, 31099, 32688, 32736, 32740),  78 },
       },
       {
-        { AOM_CDF6(17904, 31376, 32608, 32736, 32740),  75 },
-        { AOM_CDF6(   57, 28030, 32494, 32729, 32733),   5 },
+        { AOM_CDF6(19775, 31747, 32667, 32736, 32740),  75 },
+        { AOM_CDF6(    4, 28933, 32511, 32732, 32736),   0 },
       },
       {
-        { AOM_CDF6(15749, 29415, 32287, 32668, 32726),  75 },
-        { AOM_CDF6(  170, 24907, 31527, 32566, 32702),   0 },
+        { AOM_CDF6(17105, 29988, 32352, 32704, 32732),  75 },
+        { AOM_CDF6(    5, 26112, 31741, 32633, 32732),   0 },
       },
       {
-        { AOM_CDF6(10203, 24118, 30238, 32080, 32562),  93 },
-        { AOM_CDF6(   95, 19638, 29424, 32134, 32602),  76 },
+        { AOM_CDF6(10631, 24891, 30498, 32167, 32638),  93 },
+        { AOM_CDF6(    4, 20962, 29880, 32217, 32689),  76 },
       },
       {
-        { AOM_CDF6( 6820, 19262, 26836, 30391, 31927),  90 },
-        { AOM_CDF6(  633, 13427, 23701, 28986, 31432),  75 },
+        { AOM_CDF6( 7259, 19563, 26854, 30459, 32035),  90 },
+        { AOM_CDF6(  161, 13687, 24042, 29325, 31661),  75 },
       },
       {
-        { AOM_CDF6(31727, 32641, 32740, 32744, 32748),  75 },
-        { AOM_CDF6(31727, 32641, 32740, 32744, 32748),  75 },
+        { AOM_CDF6(31243, 32617, 32724, 32736, 32740),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(15406, 30201, 32359, 32684, 32732),  90 },
-        { AOM_CDF6(15406, 30201, 32359, 32684, 32732),  90 },
+        { AOM_CDF6(15771, 29814, 32176, 32618, 32719),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 7790, 20673, 28093, 31356, 32248),   6 },
-        { AOM_CDF6( 7790, 20673, 28093, 31356, 32248),   6 },
+        { AOM_CDF6( 8991, 20335, 27006, 30538, 31920),   1 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 4934, 13061, 20093, 24456, 26939),   0 },
-        { AOM_CDF6( 4934, 13061, 20093, 24456, 26939),   0 },
+        { AOM_CDF6(11004, 16889, 22530, 26291, 28694),  32 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 1586,  7752, 14710, 20348, 24664),   0 },
-        { AOM_CDF6( 1586,  7752, 14710, 20348, 24664),   0 },
+        { AOM_CDF6( 2048,  4096, 16384, 20480, 28672),  50 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2556,  5578,  8366, 16268, 20219),   0 },
-        { AOM_CDF6( 2556,  5578,  8366, 16268, 20219),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 2521,  5041,  8822, 13233, 14494),   0 },
-        { AOM_CDF6( 2521,  5041,  8822, 13233, 14494),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(32430, 32744, 32748, 32752, 32756),   0 },
-        { AOM_CDF6(32430, 32744, 32748, 32752, 32756),   0 },
+        { AOM_CDF6(32375, 32744, 32748, 32752, 32756),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(21293, 32055, 32715, 32736, 32740), 115 },
-        { AOM_CDF6(21293, 32055, 32715, 32736, 32740), 115 },
+        { AOM_CDF6(21853, 32148, 32719, 32736, 32740),  90 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(13103, 28431, 31813, 32514, 32666),  77 },
-        { AOM_CDF6(13103, 28431, 31813, 32514, 32666),  77 },
+        { AOM_CDF6(14100, 28596, 31850, 32559, 32685),  85 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6(11926, 24738, 30229, 31941, 32473), 100 },
-        { AOM_CDF6(11926, 24738, 30229, 31941, 32473), 100 },
+        { AOM_CDF6(11320, 25619, 29193, 31576, 32172),  75 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 8797, 18693, 24411, 29249, 31229),   0 },
-        { AOM_CDF6( 8797, 18693, 24411, 29249, 31229),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
     },
     {
       {
-        { AOM_CDF6( 8613, 20556, 23536, 25091, 26003),  62 },
-        { AOM_CDF6( 1986, 22838, 26810, 27803, 30782),   0 },
+        { AOM_CDF6(17586, 29249, 30954, 31637, 31943),  60 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 6279, 18732, 26646, 30934, 31795),  15 },
-        { AOM_CDF6(    4, 10543, 23137, 29084, 31111),   0 },
+        { AOM_CDF6( 6607, 19220, 27249, 31067, 32015),  15 },
+        { AOM_CDF6(    4, 12693, 25132, 30060, 31735),   0 },
       },
       {
-        { AOM_CDF6( 8218, 19760, 27324, 30665, 31557),   5 },
-        { AOM_CDF6(    4, 12799, 23864, 26749, 29109),   0 },
+        { AOM_CDF6(11218, 23056, 28975, 31289, 32045),   5 },
+        { AOM_CDF6(    4, 16611, 26400, 28905, 30652),   1 },
       },
       {
-        { AOM_CDF6( 4475, 14723, 21406, 25961, 29402),  75 },
-        { AOM_CDF6(    4, 10550, 16902, 23737, 26955),  75 },
+        { AOM_CDF6( 4973, 15646, 22529, 27020, 30234),  75 },
+        { AOM_CDF6(    4, 11786, 18820, 25595, 28661),  75 },
       },
       {
-        { AOM_CDF6( 4448,  9585, 15110, 21430, 23401),   0 },
-        { AOM_CDF6(  309,  5193, 13034, 17861, 22598), 100 },
+        { AOM_CDF6( 4994, 11005, 17116, 23193, 25485),   0 },
+        { AOM_CDF6(   10,  5820, 14233, 19478, 24366),  75 },
       },
       {
-        { AOM_CDF6( 1077,  7491, 14022, 17113, 20146),  25 },
-        { AOM_CDF6( 2105,  6352, 11058, 15427, 20316),   0 },
+        { AOM_CDF6( 1327,  8818, 15358, 18969, 22525),  25 },
+        { AOM_CDF6( 1517,  5910, 11125, 16349, 21591),   0 },
       },
       {
-        { AOM_CDF6(   70,  4311, 10294, 13415, 14999),   1 },
-        { AOM_CDF6( 2108,  5758, 10101, 12876, 18393),  75 },
+        { AOM_CDF6(  123,  5065, 11340, 15150, 17222),  16 },
+        { AOM_CDF6( 1786,  5857, 10807, 14291, 19911),  75 },
       },
       {
-        { AOM_CDF6( 2564,  6809, 11633, 15439, 18753),  79 },
-        { AOM_CDF6(  575,  2488,  5007,  6371, 10735),   4 },
+        { AOM_CDF6( 2928,  7753, 12931, 17083, 20510),  75 },
+        { AOM_CDF6(  549,  2673,  5713,  7772, 12679),   3 },
       },
       {
-        { AOM_CDF6(  723,  3507,  9011, 10667, 13029),   2 },
-        { AOM_CDF6(  252,  4003,  6745,  9277, 12244),  79 },
+        { AOM_CDF6( 1125,  4606,  9305, 11931, 14884),  13 },
+        { AOM_CDF6(   12,  3709,  6058,  8777, 11932),  85 },
       },
       {
-        { AOM_CDF6(21500, 31191, 32202, 32440, 32653),  11 },
-        { AOM_CDF6(11699, 26342, 32210, 32680, 32729),  15 },
+        { AOM_CDF6(19675, 31285, 32524, 32698, 32732),  11 },
+        { AOM_CDF6(11455, 26740, 32279, 32717, 32732),   3 },
       },
       {
-        { AOM_CDF6( 9266, 28260, 31935, 32650, 32702),   3 },
-        { AOM_CDF6(   12, 22710, 31051, 32462, 32682),   8 },
+        { AOM_CDF6(10345, 28211, 31805, 32644, 32732),   3 },
+        { AOM_CDF6(    4, 23277, 31209, 32545, 32732),   8 },
       },
       {
-        { AOM_CDF6(11689, 24665, 30573, 32137, 32475),   6 },
-        { AOM_CDF6(   64, 18543, 27879, 31017, 32128),  83 },
+        { AOM_CDF6(13559, 26348, 31030, 32344, 32653),   6 },
+        { AOM_CDF6(    4, 19849, 28463, 31321, 32304),  83 },
       },
       {
-        { AOM_CDF6( 7204, 20213, 26931, 30222, 31650),  75 },
-        { AOM_CDF6(   12, 13666, 23220, 28445, 30662),   0 },
+        { AOM_CDF6( 7549, 20488, 27158, 30433, 31903),  75 },
+        { AOM_CDF6(    4, 15187, 24493, 29279, 31267),   0 },
       },
       {
-        { AOM_CDF6( 4445, 14032, 21192, 26262, 29127),  75 },
-        { AOM_CDF6( 1071,  9072, 17930, 23602, 27713),  90 },
+        { AOM_CDF6( 4919, 15070, 22336, 27218, 29792),  75 },
+        { AOM_CDF6(  296,  9560, 18580, 24640, 28571),  75 },
       },
       {
-        { AOM_CDF6( 3859, 11533, 20546, 27129, 28995),   5 },
-        { AOM_CDF6(  184,  8308, 15465, 20333, 24250),  75 },
+        { AOM_CDF6( 4449, 12778, 20939, 26844, 28917),   5 },
+        { AOM_CDF6(    4,  8819, 16299, 21272, 25505),  75 },
       },
       {
-        { AOM_CDF6( 2430,  7985, 14207, 19894, 23379),  78 },
-        { AOM_CDF6(   85,  7758, 12921, 17137, 20512),   0 },
+        { AOM_CDF6( 2662,  8971, 15434, 20936, 24242),  77 },
+        { AOM_CDF6(    5,  7370, 13045, 17765, 21686),  90 },
       },
       {
-        { AOM_CDF6(21566, 32515, 32740, 32744, 32748),   5 },
-        { AOM_CDF6( 8620, 30973, 32707, 32736, 32740),  78 },
+        { AOM_CDF6(23376, 32614, 32740, 32744, 32748),   5 },
+        { AOM_CDF6( 7252, 31056, 32698, 32736, 32740),  78 },
       },
       {
-        { AOM_CDF6(17279, 31216, 32596, 32736, 32740),  90 },
-        { AOM_CDF6(  207, 27501, 32482, 32723, 32732),  76 },
+        { AOM_CDF6(18958, 31560, 32655, 32736, 32740),  90 },
+        { AOM_CDF6(    7, 28722, 32521, 32728, 32732),  76 },
       },
       {
-        { AOM_CDF6(13625, 28746, 32081, 32634, 32702),  90 },
-        { AOM_CDF6(  137, 23469, 31179, 32458, 32670),   1 },
+        { AOM_CDF6(15525, 29433, 32224, 32682, 32732),  90 },
+        { AOM_CDF6(    5, 25379, 31608, 32598, 32732),   1 },
       },
       {
-        { AOM_CDF6( 9348, 24108, 30408, 32306, 32629), 100 },
-        { AOM_CDF6(  588, 17392, 27403, 31193, 32262),  75 },
+        { AOM_CDF6(10133, 24671, 30659, 32294, 32704),  75 },
+        { AOM_CDF6(  194, 19014, 28420, 31496, 32473),  75 },
       },
       {
-        { AOM_CDF6( 5467, 17883, 25316, 29345, 31422),   5 },
-        { AOM_CDF6( 1273, 11714, 21205, 27668, 30187), 100 },
+        { AOM_CDF6( 6037, 17899, 25577, 29484, 31446),  75 },
+        { AOM_CDF6(  675, 12416, 22211, 28031, 30591),  75 },
       },
       {
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
@@ -6172,88 +6172,88 @@
     },
     {
       {
-        { AOM_CDF6(13160, 19266, 26298, 29021, 29957),  62 },
-        { AOM_CDF6( 1092, 20753, 26214, 27307, 29491),   0 },
+        { AOM_CDF6(20160, 28303, 31010, 31935, 32259),  65 },
+        { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
       },
       {
-        { AOM_CDF6( 4494, 17963, 26089, 30266, 31649),  50 },
-        { AOM_CDF6(    4, 11259, 24279, 30041, 31846),   5 },
+        { AOM_CDF6( 6387, 21131, 28651, 31386, 32236),  51 },
+        { AOM_CDF6(    4, 14343, 25805, 30386, 31978),   5 },
       },
       {
-        { AOM_CDF6( 8127, 20172, 25885, 28716, 30473),  26 },
-        { AOM_CDF6(    4, 15477, 24326, 28905, 30937),  26 },
+        { AOM_CDF6(10794, 23651, 28414, 30514, 31623),  26 },
+        { AOM_CDF6(    4, 18792, 26345, 29842, 31433),  26 },
       },
       {
-        { AOM_CDF6( 7212, 18933, 23539, 26142, 28510),  31 },
-        { AOM_CDF6(   18,  4513, 14791, 24270, 27565),  51 },
+        { AOM_CDF6( 7250, 18857, 23745, 26494, 29185),  31 },
+        { AOM_CDF6(   59,  5934, 16720, 25540, 28810),  51 },
       },
       {
-        { AOM_CDF6( 4725, 13158, 18974, 22416, 25027),   0 },
-        { AOM_CDF6(    4,  6667, 11649, 18165, 23220),  75 },
+        { AOM_CDF6( 4853, 13443, 19345, 23384, 26041),   0 },
+        { AOM_CDF6(    4,  7130, 12348, 18932, 24173),  75 },
       },
       {
-        { AOM_CDF6( 2450,  9526, 13330, 18186, 20899),   0 },
-        { AOM_CDF6(  135,  5116,  9741, 15376, 18761),   1 },
+        { AOM_CDF6( 2667,  9653, 13863, 18817, 21760),   1 },
+        { AOM_CDF6(    4,  5477, 10652, 16140, 19594),   1 },
       },
       {
-        { AOM_CDF6( 2424,  7825, 12782, 17792, 19814),   4 },
-        { AOM_CDF6(  943,  3248,  7356,  9921, 13757),  17 },
+        { AOM_CDF6( 2595,  7918, 13026, 17820, 20007),  77 },
+        { AOM_CDF6(  508,  3110,  7370, 10565, 14704),   2 },
       },
       {
-        { AOM_CDF6( 1923,  5841,  8602, 11234, 13778),  92 },
-        { AOM_CDF6( 1261,  3199,  7476, 11149, 13961),   0 },
+        { AOM_CDF6( 1961,  6366,  9476, 12294, 15249),  90 },
+        { AOM_CDF6(  753,  2600,  6724, 10877, 14165),  15 },
       },
       {
-        { AOM_CDF6( 1271,  4107,  6087,  8404, 10405),  95 },
-        { AOM_CDF6(  364,  2061,  4403,  6650,  9569),  17 },
+        { AOM_CDF6( 1420,  4356,  6620,  8937, 10997),  90 },
+        { AOM_CDF6(  120,  1977,  4498,  6986,  9746),  75 },
       },
       {
-        { AOM_CDF6(19974, 31195, 32511, 32650, 32708),  64 },
-        { AOM_CDF6(11043, 27360, 32405, 32678, 32732),   0 },
+        { AOM_CDF6(20741, 31938, 32628, 32728, 32732),  35 },
+        { AOM_CDF6( 9417, 28087, 32436, 32701, 32732),   3 },
       },
       {
-        { AOM_CDF6(11073, 28422, 32132, 32651, 32704),   0 },
-        { AOM_CDF6(   91, 23170, 30711, 32209, 32618),   0 },
+        { AOM_CDF6(12348, 28499, 31976, 32606, 32720),   0 },
+        { AOM_CDF6(    4, 24379, 31121, 32398, 32684),   0 },
       },
       {
-        { AOM_CDF6(11024, 25260, 30211, 32007, 32423),  16 },
-        { AOM_CDF6(   26, 20572, 28818, 31501, 32244),  26 },
+        { AOM_CDF6(13275, 26774, 30839, 32177, 32535),  16 },
+        { AOM_CDF6(    4, 21429, 28887, 31453, 32269),  26 },
       },
       {
-        { AOM_CDF6( 7119, 21592, 27990, 30777, 31784),   1 },
-        { AOM_CDF6( 1894, 12546, 22679, 28466, 30651),  76 },
+        { AOM_CDF6( 7379, 21206, 27561, 30526, 31713),   1 },
+        { AOM_CDF6(  703, 12333, 22878, 28540, 30860),   1 },
       },
       {
-        { AOM_CDF6( 5351, 15769, 22334, 27146, 29388),  75 },
-        { AOM_CDF6(  288,  9553, 18635, 24945, 28121),  75 },
+        { AOM_CDF6( 5216, 15396, 22184, 26885, 29262),  75 },
+        { AOM_CDF6(   24,  9666, 18359, 24699, 28006),   0 },
       },
       {
-        { AOM_CDF6( 4265, 13205, 19307, 24759, 27357),  15 },
-        { AOM_CDF6(  984,  7888, 15234, 20377, 24333),   1 },
+        { AOM_CDF6( 4332, 12591, 18916, 23721, 26816),   3 },
+        { AOM_CDF6(  499,  7000, 14338, 19317, 23450),   0 },
       },
       {
-        { AOM_CDF6( 3618,  9695, 14664, 19765, 22936),  75 },
-        { AOM_CDF6(  136,  3144,  8883, 13039, 14830),   3 },
+        { AOM_CDF6( 3594,  9556, 14336, 19090, 22322),  75 },
+        { AOM_CDF6(   17,  3572,  9288, 13324, 15737),   0 },
       },
       {
-        { AOM_CDF6(22563, 32398, 32730, 32736, 32740),  75 },
-        { AOM_CDF6(10900, 31406, 32732, 32736, 32740),   3 },
+        { AOM_CDF6(24009, 32537, 32740, 32744, 32748),  75 },
+        { AOM_CDF6(10094, 31466, 32706, 32736, 32740),   0 },
       },
       {
-        { AOM_CDF6(17540, 31373, 32648, 32736, 32740),  80 },
-        { AOM_CDF6( 1176, 27728, 32234, 32679, 32732),  78 },
+        { AOM_CDF6(19318, 31691, 32676, 32736, 32740),  80 },
+        { AOM_CDF6(  319, 28584, 32312, 32719, 32732),  75 },
       },
       {
-        { AOM_CDF6(14607, 28847, 31996, 32616, 32713),  90 },
-        { AOM_CDF6(  724, 24111, 31336, 32435, 32676),  75 },
+        { AOM_CDF6(15897, 29451, 32143, 32648, 32732),  75 },
+        { AOM_CDF6(  219, 25102, 31471, 32488, 32732),  75 },
       },
       {
-        { AOM_CDF6( 9831, 24661, 30499, 32029, 32499),   0 },
-        { AOM_CDF6(  995, 17805, 27641, 31300, 32308), 100 },
+        { AOM_CDF6(10046, 24716, 30457, 32055, 32572),   0 },
+        { AOM_CDF6(  503, 18762, 28275, 31529, 32438),  75 },
       },
       {
-        { AOM_CDF6( 5169, 15856, 23014, 27080, 29509),  76 },
-        { AOM_CDF6(  858, 11007, 19697, 25201, 28493),  76 },
+        { AOM_CDF6( 5398, 16028, 23301, 27427, 29942),  76 },
+        { AOM_CDF6(  497, 11148, 20015, 25561, 28959),  76 },
       },
       {
         { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
@@ -6310,202 +6310,202 @@
 static const aom_cdf_prob av1_default_coeff_base_lf_multi_uv_cdfs[4][12][2][CDF_SIZE(6)] = {
   {
     {
-      { AOM_CDF6(14366, 26260, 30107, 31462, 31984),   6 },
-      { AOM_CDF6(14366, 26260, 30107, 31462, 31984),   6 },
+      { AOM_CDF6(14076, 26464, 29938, 31308, 31828),   6 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 8435, 20211, 26486, 29544, 30971),  75 },
-      { AOM_CDF6( 8435, 20211, 26486, 29544, 30971),  75 },
+      { AOM_CDF6( 7520, 21227, 27766, 30312, 31477),  75 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 4468, 12279, 18551, 23241, 26398), 118 },
-      { AOM_CDF6( 4468, 12279, 18551, 23241, 26398), 118 },
+      { AOM_CDF6( 4377, 13290, 19811, 24220, 27064),  90 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 2017,  5852,  9588, 13227, 16466),  90 },
-      { AOM_CDF6( 2017,  5852,  9588, 13227, 16466),  90 },
+      { AOM_CDF6( 1682,  5139,  8601, 11973, 15046),  90 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6(13234, 26965, 30663, 31921, 32326),   6 },
-      { AOM_CDF6(13234, 26965, 30663, 31921, 32326),   6 },
+      { AOM_CDF6(15235, 28605, 31367, 32151, 32451),   6 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 9638, 23022, 28785, 31064, 31943), 118 },
-      { AOM_CDF6( 9638, 23022, 28785, 31064, 31943), 118 },
+      { AOM_CDF6(10256, 24586, 29775, 31465, 32137),  93 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 5677, 15107, 21848, 26210, 28932),  90 },
-      { AOM_CDF6( 5677, 15107, 21848, 26210, 28932),  90 },
+      { AOM_CDF6( 5918, 15629, 22317, 26602, 29101),  90 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 2482,  7244, 11769, 15966, 19494),   0 },
-      { AOM_CDF6( 2482,  7244, 11769, 15966, 19494),   0 },
+      { AOM_CDF6( 2015,  5704,  9835, 13705, 17299),  76 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6(26308, 32422, 32700, 32734, 32738),   0 },
-      { AOM_CDF6(26308, 32422, 32700, 32734, 32738),   0 },
+      { AOM_CDF6(26420, 31955, 32312, 32430, 32526),  75 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6(18410, 31272, 32441, 32627, 32684),  80 },
-      { AOM_CDF6(18410, 31272, 32441, 32627, 32684),  80 },
+      { AOM_CDF6(16374, 29560, 31531, 32023, 32291),  30 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 9279, 21122, 27290, 29891, 30980),   2 },
-      { AOM_CDF6( 9279, 21122, 27290, 29891, 30980),   2 },
+      { AOM_CDF6( 7197, 15954, 20986, 24934, 27737),   6 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 5425, 11645, 15311, 18838, 21700),  24 },
-      { AOM_CDF6( 5425, 11645, 15311, 18838, 21700),  24 },
+      { AOM_CDF6( 4820,  9488, 11701, 14065, 16248),  11 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
   },
   {
     {
-      { AOM_CDF6(15811, 26488, 30226, 31615, 32132),   6 },
-      { AOM_CDF6(15811, 26488, 30226, 31615, 32132),   6 },
+      { AOM_CDF6(15362, 27650, 30927, 32014, 32397),   6 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 8921, 21492, 27700, 30444, 31559),  75 },
-      { AOM_CDF6( 8921, 21492, 27700, 30444, 31559),  75 },
+      { AOM_CDF6( 9556, 22999, 28733, 31004, 31942),  75 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 4841, 13432, 20064, 24648, 27631),  93 },
-      { AOM_CDF6( 4841, 13432, 20064, 24648, 27631),  93 },
+      { AOM_CDF6( 5238, 14626, 21567, 26015, 28727),  78 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 2088,  6035,  9950, 13721, 17072), 118 },
-      { AOM_CDF6( 2088,  6035,  9950, 13721, 17072), 118 },
+      { AOM_CDF6( 2196,  6512, 10780, 14847, 18294),  93 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6(15540, 27901, 31326, 32200, 32479),   0 },
-      { AOM_CDF6(15540, 27901, 31326, 32200, 32479),   0 },
+      { AOM_CDF6(15569, 28727, 31706, 32423, 32650),   0 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6(10351, 24377, 29698, 31536, 32155),  75 },
-      { AOM_CDF6(10351, 24377, 29698, 31536, 32155),  75 },
+      { AOM_CDF6(11506, 25824, 30517, 31948, 32443),  75 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 5509, 15008, 21741, 26006, 28626),  90 },
-      { AOM_CDF6( 5509, 15008, 21741, 26006, 28626),  90 },
+      { AOM_CDF6( 6211, 16772, 23701, 27732, 29961),  90 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 2146,  6241, 10294, 14072, 17392), 115 },
-      { AOM_CDF6( 2146,  6241, 10294, 14072, 17392), 115 },
+      { AOM_CDF6( 2461,  7239, 11755, 15869, 19210),  90 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6(27338, 32320, 32643, 32709, 32732),  93 },
-      { AOM_CDF6(27338, 32320, 32643, 32709, 32732),  93 },
+      { AOM_CDF6(26951, 32136, 32556, 32654, 32696),  75 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6(17248, 30295, 31985, 32426, 32580),  90 },
-      { AOM_CDF6(17248, 30295, 31985, 32426, 32580),  90 },
+      { AOM_CDF6(17691, 30215, 31944, 32399, 32550),  75 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 7979, 18661, 24838, 28420, 30133),  90 },
-      { AOM_CDF6( 7979, 18661, 24838, 28420, 30133),  90 },
+      { AOM_CDF6( 9349, 19307, 25385, 29027, 30821),   6 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 4565, 11089, 15855, 19468, 22228),  16 },
-      { AOM_CDF6( 4565, 11089, 15855, 19468, 22228),  16 },
+      { AOM_CDF6( 8528, 15111, 18457, 21676, 23767),  37 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
   },
   {
     {
-      { AOM_CDF6(14796, 27248, 30689, 31786, 32176),   1 },
-      { AOM_CDF6(14796, 27248, 30689, 31786, 32176),   1 },
+      { AOM_CDF6(14853, 28192, 31400, 32275, 32557),   1 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 8580, 21471, 27905, 30611, 31681),  75 },
-      { AOM_CDF6( 8580, 21471, 27905, 30611, 31681),  75 },
+      { AOM_CDF6(10499, 24975, 30136, 31803, 32399),  75 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 4644, 13296, 20094, 24691, 27651), 118 },
-      { AOM_CDF6( 4644, 13296, 20094, 24691, 27651), 118 },
+      { AOM_CDF6( 5543, 15727, 22759, 27080, 29613),  75 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 1845,  5492,  9273, 13250, 16963), 123 },
-      { AOM_CDF6( 1845,  5492,  9273, 13250, 16963), 123 },
+      { AOM_CDF6( 2214,  6634, 11179, 15534, 19289),  90 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6(15149, 27491, 30644, 31724, 32177),   0 },
-      { AOM_CDF6(15149, 27491, 30644, 31724, 32177),   0 },
+      { AOM_CDF6(15032, 28602, 31421, 32234, 32548),   0 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 8469, 21408, 27928, 30603, 31665), 118 },
-      { AOM_CDF6( 8469, 21408, 27928, 30603, 31665), 118 },
+      { AOM_CDF6(10857, 24883, 29885, 31603, 32255),   0 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 4538, 12465, 18903, 23659, 26874),  93 },
-      { AOM_CDF6( 4538, 12465, 18903, 23659, 26874),  93 },
+      { AOM_CDF6( 5068, 14275, 20979, 25484, 28338),   0 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 1812,  5425,  9106, 12838, 16349), 115 },
-      { AOM_CDF6( 1812,  5425,  9106, 12838, 16349), 115 },
+      { AOM_CDF6( 1825,  5574,  9437, 13284, 16813),  93 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6(27658, 32396, 32681, 32736, 32740),  75 },
-      { AOM_CDF6(27658, 32396, 32681, 32736, 32740),  75 },
+      { AOM_CDF6(28668, 32450, 32696, 32736, 32740),  15 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6(17508, 30543, 32263, 32604, 32687), 115 },
-      { AOM_CDF6(17508, 30543, 32263, 32604, 32687), 115 },
+      { AOM_CDF6(17386, 30911, 32385, 32652, 32732),  90 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 8627, 20222, 26962, 30179, 31545),  77 },
-      { AOM_CDF6( 8627, 20222, 26962, 30179, 31545),  77 },
+      { AOM_CDF6( 9471, 20994, 27290, 30512, 31784),  15 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 4502, 11287, 17510, 22262, 25858),  79 },
-      { AOM_CDF6( 4502, 11287, 17510, 22262, 25858),  79 },
+      { AOM_CDF6( 7211, 13700, 19148, 23635, 26679),   0 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
   },
   {
     {
-      { AOM_CDF6(12028, 25805, 30242, 31686, 32104),  14 },
-      { AOM_CDF6(12028, 25805, 30242, 31686, 32104),  14 },
+      { AOM_CDF6( 7986, 24484, 30470, 32123, 32478),  12 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 6873, 20683, 28552, 31327, 32198),  75 },
-      { AOM_CDF6( 6873, 20683, 28552, 31327, 32198),  75 },
+      { AOM_CDF6( 6385, 22268, 29781, 31884, 32479),   6 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 4417, 13376, 21020, 26076, 29345),  99 },
-      { AOM_CDF6( 4417, 13376, 21020, 26076, 29345),  99 },
+      { AOM_CDF6( 4563, 14337, 22377, 27527, 30631),  75 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 1872,  5776, 10779, 15967, 20663), 120 },
-      { AOM_CDF6( 1872,  5776, 10779, 15967, 20663), 120 },
+      { AOM_CDF6( 1768,  5903, 10730, 16633, 21440),  90 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6(12010, 25672, 30138, 31773, 32134),  35 },
-      { AOM_CDF6(12010, 25672, 30138, 31773, 32134),  35 },
+      { AOM_CDF6( 7554, 22427, 29258, 31475, 32386),   5 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 7029, 21007, 28934, 31567, 32294),  90 },
-      { AOM_CDF6( 7029, 21007, 28934, 31567, 32294),  90 },
+      { AOM_CDF6( 6209, 20694, 28786, 31444, 32330),  90 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 4309, 12652, 20158, 25517, 29022),  76 },
-      { AOM_CDF6( 4309, 12652, 20158, 25517, 29022),  76 },
+      { AOM_CDF6( 4185, 12361, 19887, 25739, 29491),  93 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 2072,  6184, 10807, 15838, 20961),  75 },
-      { AOM_CDF6( 2072,  6184, 10807, 15838, 20961),  75 },
+      { AOM_CDF6( 1583,  5456,  9702, 15370, 20474),  90 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6(29343, 32431, 32638, 32716, 32732),  45 },
-      { AOM_CDF6(29343, 32431, 32638, 32716, 32732),  45 },
+      { AOM_CDF6(30183, 32316, 32574, 32639, 32703),  90 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6(18659, 30546, 32380, 32697, 32732), 100 },
-      { AOM_CDF6(18659, 30546, 32380, 32697, 32732), 100 },
+      { AOM_CDF6(15147, 31729, 32521, 32669, 32719),  35 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 5958,  8937, 23831, 26810, 28300), 100 },
-      { AOM_CDF6( 5958,  8937, 23831, 26810, 28300), 100 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
     {
-      { AOM_CDF6( 4681,  9362, 14043, 18725, 28087),   0 },
-      { AOM_CDF6( 4681,  9362, 14043, 18725, 28087),   0 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+      { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
     },
   },
 };
@@ -6513,151 +6513,37 @@
 static const aom_cdf_prob av1_default_idtx_sign_cdfs[4][5][9][CDF_SIZE(2)] = {
   {
     {
-      { AOM_CDF2(15400), 103 },
-      { AOM_CDF2(25752), 103 },
-      { AOM_CDF2( 6411), 103 },
-      { AOM_CDF2(29907),   0 },
-      { AOM_CDF2( 1735),  80 },
-      { AOM_CDF2(29773),  94 },
-      { AOM_CDF2( 3878),  75 },
-      { AOM_CDF2(32660),   1 },
-      { AOM_CDF2(  180),  91 },
+      { AOM_CDF2(15560),  93 },
+      { AOM_CDF2(24775),  93 },
+      { AOM_CDF2( 7540),  93 },
+      { AOM_CDF2(27844),   0 },
+      { AOM_CDF2( 3545),  75 },
+      { AOM_CDF2(28880),  82 },
+      { AOM_CDF2( 4886),  80 },
+      { AOM_CDF2(32178),   6 },
+      { AOM_CDF2( 1204),  75 },
     },
     {
-      { AOM_CDF2(15290),   0 },
-      { AOM_CDF2(28210),  90 },
-      { AOM_CDF2( 3662),  90 },
-      { AOM_CDF2(30884),   0 },
-      { AOM_CDF2(  626),  78 },
-      { AOM_CDF2(30964),  76 },
-      { AOM_CDF2( 1522),  75 },
-      { AOM_CDF2(32648),  75 },
-      { AOM_CDF2(   56), 120 },
+      { AOM_CDF2(14810),   3 },
+      { AOM_CDF2(26650),  75 },
+      { AOM_CDF2( 5063),  90 },
+      { AOM_CDF2(29212),  15 },
+      { AOM_CDF2( 1994),  78 },
+      { AOM_CDF2(29106),  90 },
+      { AOM_CDF2( 3267),  90 },
+      { AOM_CDF2(32118),   0 },
+      { AOM_CDF2(  537),  93 },
     },
     {
-      { AOM_CDF2(10694),  31 },
-      { AOM_CDF2(29934),  81 },
-      { AOM_CDF2( 1212),  76 },
-      { AOM_CDF2(32053),  15 },
-      { AOM_CDF2(   97),  90 },
-      { AOM_CDF2(32356), 100 },
-      { AOM_CDF2(  136),  78 },
-      { AOM_CDF2(32751), 106 },
-      { AOM_CDF2(    8), 108 },
-    },
-    {
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-    },
-    {
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-    },
-  },
-  {
-    {
-      { AOM_CDF2(18210),  78 },
-      { AOM_CDF2(25918),  93 },
-      { AOM_CDF2( 9621),  93 },
-      { AOM_CDF2(29491),   0 },
-      { AOM_CDF2( 9368),  31 },
-      { AOM_CDF2(31030),  90 },
-      { AOM_CDF2( 3815), 103 },
-      { AOM_CDF2(32439), 100 },
-      { AOM_CDF2( 2455),   0 },
-    },
-    {
-      { AOM_CDF2(18967),   0 },
-      { AOM_CDF2(27730),  75 },
-      { AOM_CDF2( 7456),  75 },
-      { AOM_CDF2(30015),   1 },
-      { AOM_CDF2( 2882),   6 },
-      { AOM_CDF2(31783),  90 },
-      { AOM_CDF2( 2087),  75 },
-      { AOM_CDF2(32543),  91 },
-      { AOM_CDF2(  669),  75 },
-    },
-    {
-      { AOM_CDF2(18273),   7 },
-      { AOM_CDF2(27763),   6 },
-      { AOM_CDF2( 6274),   6 },
-      { AOM_CDF2(29647),  32 },
-      { AOM_CDF2( 1854),  26 },
-      { AOM_CDF2(32079),  76 },
-      { AOM_CDF2( 1083),   0 },
-      { AOM_CDF2(32487),  11 },
-      { AOM_CDF2(  410),  83 },
-    },
-    {
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-    },
-    {
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-    },
-  },
-  {
-    {
-      { AOM_CDF2(18453),  90 },
-      { AOM_CDF2(25590),  75 },
-      { AOM_CDF2(10262),  90 },
-      { AOM_CDF2(25168),  25 },
-      { AOM_CDF2(13246),   1 },
-      { AOM_CDF2(31015),  78 },
-      { AOM_CDF2( 4514),   9 },
-      { AOM_CDF2(31187),  49 },
-      { AOM_CDF2( 5011),  49 },
-    },
-    {
-      { AOM_CDF2(19200),  78 },
-      { AOM_CDF2(27721),  78 },
-      { AOM_CDF2( 7982),  78 },
-      { AOM_CDF2(26609),   0 },
-      { AOM_CDF2( 8128),   6 },
-      { AOM_CDF2(31826),  90 },
-      { AOM_CDF2( 2334),  75 },
-      { AOM_CDF2(31361),  45 },
-      { AOM_CDF2( 2321),   6 },
-    },
-    {
-      { AOM_CDF2(19567),   0 },
-      { AOM_CDF2(28437),   0 },
-      { AOM_CDF2( 6801),   3 },
-      { AOM_CDF2(25757),  32 },
-      { AOM_CDF2(10038),   7 },
-      { AOM_CDF2(31927),  90 },
+      { AOM_CDF2(11533),  31 },
+      { AOM_CDF2(28709),  76 },
       { AOM_CDF2( 2095),  90 },
-      { AOM_CDF2(31761),  31 },
-      { AOM_CDF2( 2139),   6 },
+      { AOM_CDF2(31598),  90 },
+      { AOM_CDF2(  331),  93 },
+      { AOM_CDF2(31760),  91 },
+      { AOM_CDF2(  319),  78 },
+      { AOM_CDF2(32511),  78 },
+      { AOM_CDF2(   60),  43 },
     },
     {
       { AOM_CDF2(16384),   0 },
@@ -6684,37 +6570,151 @@
   },
   {
     {
-      { AOM_CDF2(18508),   7 },
-      { AOM_CDF2(28260),   3 },
-      { AOM_CDF2( 6366),  90 },
+      { AOM_CDF2(17010),   0 },
+      { AOM_CDF2(25832),   0 },
+      { AOM_CDF2( 7718),   3 },
+      { AOM_CDF2(29537),   1 },
+      { AOM_CDF2( 8925),  31 },
+      { AOM_CDF2(30595),  75 },
+      { AOM_CDF2( 4677),  90 },
+      { AOM_CDF2(32471),  90 },
+      { AOM_CDF2( 3023),   1 },
+    },
+    {
+      { AOM_CDF2(17528),  25 },
+      { AOM_CDF2(27808),   0 },
+      { AOM_CDF2( 6222),   0 },
+      { AOM_CDF2(29747),   1 },
+      { AOM_CDF2( 2848),  31 },
+      { AOM_CDF2(31635),  75 },
+      { AOM_CDF2( 2513),  75 },
+      { AOM_CDF2(32514),  75 },
+      { AOM_CDF2(  474),  18 },
+    },
+    {
+      { AOM_CDF2(19157),  31 },
+      { AOM_CDF2(30551),  31 },
+      { AOM_CDF2( 2788),  31 },
+      { AOM_CDF2(30752),  37 },
+      { AOM_CDF2(  701),  26 },
+      { AOM_CDF2(32565),  15 },
+      { AOM_CDF2(  359),   8 },
+      { AOM_CDF2(32515),  87 },
+      { AOM_CDF2(  223),  37 },
+    },
+    {
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(32440),  50 },
-      { AOM_CDF2(  382),  50 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
     },
     {
-      { AOM_CDF2(19940),   2 },
-      { AOM_CDF2(30534),  75 },
-      { AOM_CDF2( 4007),   0 },
-      { AOM_CDF2(16384), 100 },
-      { AOM_CDF2(16384),  50 },
-      { AOM_CDF2(32654),  23 },
-      { AOM_CDF2(  219),  24 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+    },
+  },
+  {
+    {
+      { AOM_CDF2(20565),   0 },
+      { AOM_CDF2(28478),  25 },
+      { AOM_CDF2( 8011),  15 },
+      { AOM_CDF2(31569),  56 },
+      { AOM_CDF2( 9937),  31 },
+      { AOM_CDF2(32166),  78 },
+      { AOM_CDF2( 4360),  83 },
+      { AOM_CDF2(32715),  38 },
+      { AOM_CDF2( 2253),  43 },
+    },
+    {
+      { AOM_CDF2(21616),  26 },
+      { AOM_CDF2(29474),  25 },
+      { AOM_CDF2( 8169),  25 },
+      { AOM_CDF2(31873),  56 },
+      { AOM_CDF2( 6252),  31 },
+      { AOM_CDF2(32360),  18 },
+      { AOM_CDF2( 2458),   0 },
+      { AOM_CDF2(32719),  52 },
+      { AOM_CDF2(  682),  68 },
+    },
+    {
+      { AOM_CDF2(22816),  31 },
+      { AOM_CDF2(30531),  26 },
+      { AOM_CDF2( 5700),  31 },
+      { AOM_CDF2(31507),  62 },
+      { AOM_CDF2( 1539),  62 },
+      { AOM_CDF2(32572),  26 },
+      { AOM_CDF2( 1015),  32 },
+      { AOM_CDF2(32694),  35 },
+      { AOM_CDF2(  412),  37 },
+    },
+    {
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
     },
     {
-      { AOM_CDF2(24675),   7 },
-      { AOM_CDF2(32391),  75 },
-      { AOM_CDF2( 1491),  76 },
-      { AOM_CDF2(16384),  50 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(32758),  34 },
-      { AOM_CDF2(  105),  25 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+    },
+  },
+  {
+    {
+      { AOM_CDF2(18478),  31 },
+      { AOM_CDF2(30410),  26 },
+      { AOM_CDF2( 3274),  16 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(32138),   0 },
+      { AOM_CDF2(  697),  50 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(16384),   0 },
+    },
+    {
+      { AOM_CDF2(24519),  32 },
+      { AOM_CDF2(32572),  26 },
+      { AOM_CDF2(  653),  13 },
+      { AOM_CDF2(32404),  50 },
+      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(32753),  83 },
+      { AOM_CDF2(   78),  86 },
+      { AOM_CDF2(32612),  50 },
+      { AOM_CDF2(16384),   0 },
+    },
+    {
+      { AOM_CDF2(27765),  62 },
+      { AOM_CDF2(32723),  78 },
+      { AOM_CDF2(  368),  31 },
+      { AOM_CDF2(32138),  50 },
+      { AOM_CDF2( 2521),  50 },
+      { AOM_CDF2(32764),  35 },
+      { AOM_CDF2(   22),  53 },
+      { AOM_CDF2(32577),  50 },
+      { AOM_CDF2(16384),   0 },
     },
     {
       { AOM_CDF2(16384),   0 },
@@ -6744,13 +6744,13 @@
 static const aom_cdf_prob av1_default_coeff_base_multi_cdfs_idtx[4][5][14][CDF_SIZE(4)] = {
   {
     {
-      { AOM_CDF4(28332, 29935, 31012),  93 },
-      { AOM_CDF4(20362, 25886, 28550),  75 },
-      { AOM_CDF4(19615, 23974, 27367),   0 },
-      { AOM_CDF4(16307, 19685, 22220),  75 },
-      { AOM_CDF4(10574, 16536, 20288),   6 },
-      { AOM_CDF4(10645, 14901, 18709),   1 },
-      { AOM_CDF4( 6210,  8625, 10664),   1 },
+      { AOM_CDF4(28343, 29890, 30977),  93 },
+      { AOM_CDF4(20601, 26193, 28764),  93 },
+      { AOM_CDF4(19490, 23791, 27048),  75 },
+      { AOM_CDF4(16423, 19493, 22007),  78 },
+      { AOM_CDF4(12176, 17688, 21070),   1 },
+      { AOM_CDF4(11254, 15066, 18960),   1 },
+      { AOM_CDF4( 7135,  9594, 11748),   1 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -6760,13 +6760,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(30832, 31659, 32075),  93 },
-      { AOM_CDF4(21119, 27845, 30142),   0 },
-      { AOM_CDF4(19103, 23961, 27788),   0 },
-      { AOM_CDF4(15884, 18535, 20988),   3 },
-      { AOM_CDF4(10366, 16173, 20111),   1 },
-      { AOM_CDF4(10704, 13963, 18007),   1 },
-      { AOM_CDF4( 6057,  7686,  9376),   1 },
+      { AOM_CDF4(30897, 31794, 32178),  93 },
+      { AOM_CDF4(20986, 28222, 30421),  15 },
+      { AOM_CDF4(18659, 24176, 27934),   0 },
+      { AOM_CDF4(15633, 18666, 21224),   3 },
+      { AOM_CDF4( 9693, 15878, 20636),   1 },
+      { AOM_CDF4(10083, 14089, 18515),   6 },
+      { AOM_CDF4( 6265,  8352, 10523),   1 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -6776,13 +6776,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(32359, 32469, 32538), 100 },
-      { AOM_CDF4(21142, 28530, 29943),   1 },
-      { AOM_CDF4(18311, 22998, 26613),   1 },
-      { AOM_CDF4(14213, 15902, 17427),  75 },
-      { AOM_CDF4( 6217, 11382, 15267),   2 },
-      { AOM_CDF4( 5172,  7635, 12107),   6 },
-      { AOM_CDF4( 2335,  3116,  3955),  75 },
+      { AOM_CDF4(32379, 32564, 32633),  75 },
+      { AOM_CDF4(22177, 29474, 30765),   1 },
+      { AOM_CDF4(18538, 23452, 26801),   1 },
+      { AOM_CDF4(14706, 16590, 18239),  75 },
+      { AOM_CDF4( 6954, 12300, 15663),   7 },
+      { AOM_CDF4( 5210,  7282, 11087),   6 },
+      { AOM_CDF4( 2614,  3781,  4955),  75 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -6826,13 +6826,13 @@
   },
   {
     {
-      { AOM_CDF4(27637, 30565, 31401),  75 },
-      { AOM_CDF4(19194, 28082, 30022),  75 },
-      { AOM_CDF4(17288, 24686, 28862),   0 },
-      { AOM_CDF4(15333, 20633, 23360),   0 },
-      { AOM_CDF4( 8479, 15708, 20299),   0 },
-      { AOM_CDF4( 5820, 10462, 15810),   0 },
-      { AOM_CDF4( 4052,  6298,  7937),   0 },
+      { AOM_CDF4(28035, 30893, 31756),  78 },
+      { AOM_CDF4(18097, 26957, 29476),  75 },
+      { AOM_CDF4(15075, 22557, 26893),   0 },
+      { AOM_CDF4(11632, 16975, 20254),   0 },
+      { AOM_CDF4( 5659, 12007, 16445),   0 },
+      { AOM_CDF4( 3855,  7854, 12411),   1 },
+      { AOM_CDF4( 2360,  4192,  5868),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -6842,13 +6842,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(30710, 32208, 32467),  75 },
-      { AOM_CDF4(21666, 30225, 31742),  75 },
-      { AOM_CDF4(18446, 26511, 30537),   0 },
-      { AOM_CDF4(15422, 21150, 24424),   0 },
-      { AOM_CDF4( 8152, 15927, 22052),   1 },
-      { AOM_CDF4( 5785, 10694, 16310),   1 },
-      { AOM_CDF4( 3933,  6287,  8406),   5 },
+      { AOM_CDF4(31009, 32323, 32574),  78 },
+      { AOM_CDF4(21342, 29678, 31451),  78 },
+      { AOM_CDF4(16940, 25075, 29268),   0 },
+      { AOM_CDF4(12426, 17800, 21533),   0 },
+      { AOM_CDF4( 6079, 13099, 18572),   1 },
+      { AOM_CDF4( 4249,  8763, 13561),   6 },
+      { AOM_CDF4( 2473,  4631,  6923),   5 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -6858,13 +6858,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(31974, 32584, 32681),  80 },
-      { AOM_CDF4(22164, 31135, 32259),   0 },
-      { AOM_CDF4(16849, 27031, 31175),   6 },
-      { AOM_CDF4(14421, 20392, 24213),   6 },
-      { AOM_CDF4( 6114, 13920, 22699),  37 },
-      { AOM_CDF4( 4166,  8660, 15473),  32 },
-      { AOM_CDF4( 2584,  4471,  6751),   1 },
+      { AOM_CDF4(32079, 32614, 32706),  75 },
+      { AOM_CDF4(22634, 30655, 31942),   0 },
+      { AOM_CDF4(16704, 25079, 29917),  31 },
+      { AOM_CDF4(12795, 17039, 20729),   6 },
+      { AOM_CDF4( 5362, 11212, 18340),  37 },
+      { AOM_CDF4( 3513,  6916, 12694),  31 },
+      { AOM_CDF4( 1883,  3540,  5856),   6 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -6908,13 +6908,13 @@
   },
   {
     {
-      { AOM_CDF4(28081, 30651, 31642),  93 },
-      { AOM_CDF4(21015, 29162, 30874),  75 },
-      { AOM_CDF4(20711, 26403, 30562),   0 },
-      { AOM_CDF4(19682, 24470, 26661),   0 },
-      { AOM_CDF4(12342, 20001, 25303),   1 },
-      { AOM_CDF4(10294, 15740, 21371),   7 },
-      { AOM_CDF4( 9787, 13332, 15360),  30 },
+      { AOM_CDF4(29171, 31341, 32069),   3 },
+      { AOM_CDF4(19097, 27499, 29866),  75 },
+      { AOM_CDF4(16660, 23539, 28386),   0 },
+      { AOM_CDF4(13020, 18986, 22564),   5 },
+      { AOM_CDF4( 6762, 13469, 18997),  31 },
+      { AOM_CDF4( 5230,  9452, 15176),  32 },
+      { AOM_CDF4( 3282,  5921,  7884),  31 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -6924,13 +6924,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(30670, 32199, 32481),  75 },
-      { AOM_CDF4(21913, 30787, 32043),  93 },
-      { AOM_CDF4(18889, 27255, 31240),  75 },
-      { AOM_CDF4(17707, 23115, 26169),   0 },
-      { AOM_CDF4( 9693, 17800, 24044),   1 },
-      { AOM_CDF4( 7150, 12327, 18583),   1 },
-      { AOM_CDF4( 6971,  9884, 12326),   6 },
+      { AOM_CDF4(31506, 32472, 32667),  75 },
+      { AOM_CDF4(20403, 29740, 31743),   3 },
+      { AOM_CDF4(14938, 24923, 30084),   0 },
+      { AOM_CDF4(10891, 19070, 24198),  30 },
+      { AOM_CDF4( 4812, 12877, 20442),  31 },
+      { AOM_CDF4( 3269,  8035, 14577),  31 },
+      { AOM_CDF4( 2373,  5157,  8269),  31 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -6940,13 +6940,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(32025, 32589, 32684),  85 },
-      { AOM_CDF4(22479, 31362, 32313),  75 },
-      { AOM_CDF4(17286, 27306, 31443),   1 },
-      { AOM_CDF4(16027, 22152, 25878),   1 },
-      { AOM_CDF4( 7631, 15855, 23931),   6 },
-      { AOM_CDF4( 5389, 10664, 17856),   1 },
-      { AOM_CDF4( 4921,  7819, 10468),   6 },
+      { AOM_CDF4(32371, 32695, 32745),  75 },
+      { AOM_CDF4(21598, 31049, 32391),   0 },
+      { AOM_CDF4(14515, 26494, 31233),  31 },
+      { AOM_CDF4(11239, 19165, 24574),  31 },
+      { AOM_CDF4( 4137, 12390, 21147),  32 },
+      { AOM_CDF4( 2658,  7002, 14001),  31 },
+      { AOM_CDF4( 2391,  5537,  8704),  26 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -6990,13 +6990,13 @@
   },
   {
     {
-      { AOM_CDF4(29321, 31402, 32585),   0 },
-      { AOM_CDF4(24982, 31542, 32538),   5 },
-      { AOM_CDF4(25292, 27217, 32553),   5 },
-      { AOM_CDF4(22458, 26136, 29103),  15 },
-      { AOM_CDF4(14760, 17180, 31874),  11 },
-      { AOM_CDF4(13023, 17414, 23724),  25 },
-      { AOM_CDF4(16460, 19241, 20844), 100 },
+      { AOM_CDF4(31026, 32443, 32748),  25 },
+      { AOM_CDF4(22538, 31251, 32718),   5 },
+      { AOM_CDF4(22228, 26294, 32627),   0 },
+      { AOM_CDF4(20903, 23313, 25862),  38 },
+      { AOM_CDF4(11627, 16067, 32345),  25 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7006,13 +7006,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(30705, 32502, 32717),  30 },
-      { AOM_CDF4(23047, 32095, 32667),   0 },
-      { AOM_CDF4(19619, 27421, 32382),  31 },
-      { AOM_CDF4(16188, 21666, 27068),  31 },
-      { AOM_CDF4( 7419, 12132, 28951),  32 },
-      { AOM_CDF4( 5170,  8890, 16032),  26 },
-      { AOM_CDF4( 6099, 10136, 13330),  57 },
+      { AOM_CDF4(31817, 32581, 32735),  25 },
+      { AOM_CDF4(19499, 31019, 32650),   0 },
+      { AOM_CDF4(13910, 24210, 32424),  31 },
+      { AOM_CDF4(12714, 20186, 29593),  62 },
+      { AOM_CDF4( 4822, 12648, 29509),  32 },
+      { AOM_CDF4( 2380,  7451, 16774),  75 },
+      { AOM_CDF4( 3072, 10791, 15675),  50 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7022,13 +7022,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(32087, 32712, 32748),  85 },
-      { AOM_CDF4(20760, 32439, 32743),   0 },
-      { AOM_CDF4(11650, 30566, 32663),  32 },
-      { AOM_CDF4(11495, 20251, 28581),  32 },
-      { AOM_CDF4( 5254,  9632, 29930),  32 },
-      { AOM_CDF4( 4291,  7115, 16582),  35 },
-      { AOM_CDF4( 7174,  8941, 11140),  32 },
+      { AOM_CDF4(32485, 32734, 32748),  75 },
+      { AOM_CDF4(19059, 32009, 32725),   0 },
+      { AOM_CDF4( 9309, 28748, 32484),  32 },
+      { AOM_CDF4( 5722, 17292, 29536),  62 },
+      { AOM_CDF4( 2186,  8637, 26136),  57 },
+      { AOM_CDF4( 1951,  5879, 15659),  33 },
+      { AOM_CDF4( 2166,  5695, 11591),  36 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7075,13 +7075,13 @@
 static const aom_cdf_prob av1_default_coeff_lps_multi_cdfs_idtx[4][5][14][CDF_SIZE(4)] = {
   {
     {
-      { AOM_CDF4( 8888, 14893, 19055),  20 },
-      { AOM_CDF4( 9588, 16202, 20486),  91 },
-      { AOM_CDF4( 8714, 14548, 18956),  75 },
-      { AOM_CDF4( 9260, 14956, 18856),  76 },
-      { AOM_CDF4( 6878, 13494, 17301), 120 },
-      { AOM_CDF4( 6610, 11685, 16043), 100 },
-      { AOM_CDF4( 3637,  6832,  9642),  93 },
+      { AOM_CDF4(10358, 16536, 21006),  15 },
+      { AOM_CDF4(10820, 18219, 22881),  91 },
+      { AOM_CDF4(10100, 15687, 20193),  75 },
+      { AOM_CDF4(10388, 15552, 19869),  75 },
+      { AOM_CDF4( 7467, 14671, 18379),  90 },
+      { AOM_CDF4( 5068,  8607, 12235),  15 },
+      { AOM_CDF4( 3545,  6569,  9269),  93 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7091,13 +7091,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 8744, 14735, 18771),   1 },
-      { AOM_CDF4(10378, 16868, 20963),   1 },
-      { AOM_CDF4( 9882, 16413, 20462),   6 },
-      { AOM_CDF4(10346, 16586, 20632),  76 },
-      { AOM_CDF4( 7694, 15061, 19003),  76 },
-      { AOM_CDF4( 6624, 12015, 17472),   1 },
-      { AOM_CDF4( 2910,  5645,  8205), 118 },
+      { AOM_CDF4(10846, 17226, 21443),   0 },
+      { AOM_CDF4(13398, 20355, 24290),  15 },
+      { AOM_CDF4(11910, 18796, 23075),   1 },
+      { AOM_CDF4(12559, 18882, 23077),  76 },
+      { AOM_CDF4( 8733, 17495, 21561),  90 },
+      { AOM_CDF4( 4080,  7646, 11249),   5 },
+      { AOM_CDF4( 3404,  6120,  8842),  75 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7107,13 +7107,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4( 6248, 11083, 14969),   1 },
-      { AOM_CDF4( 7833, 12765, 16941),   7 },
-      { AOM_CDF4( 6338, 11625, 15656),   7 },
-      { AOM_CDF4( 8402, 13148, 16773),  12 },
-      { AOM_CDF4( 5513, 11910, 15703),   7 },
-      { AOM_CDF4( 4650,  8859, 15312),  32 },
-      { AOM_CDF4( 1890,  3872,  5855),  91 },
+      { AOM_CDF4( 7328, 12456, 16707),  91 },
+      { AOM_CDF4( 8772, 14457, 18914),   2 },
+      { AOM_CDF4( 8195, 13709, 17968),   2 },
+      { AOM_CDF4(10966, 15804, 19497),   7 },
+      { AOM_CDF4( 5374, 13909, 17992),   7 },
+      { AOM_CDF4( 2314,  4570,  7480),  31 },
+      { AOM_CDF4( 1645,  3387,  5133),  76 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7157,13 +7157,13 @@
   },
   {
     {
-      { AOM_CDF4(10602, 17253, 21709),   0 },
-      { AOM_CDF4(10001, 16453, 20888),  75 },
-      { AOM_CDF4(10225, 16422, 20615),  90 },
-      { AOM_CDF4(12729, 18644, 22341),  90 },
-      { AOM_CDF4( 8995, 17423, 21566),  75 },
-      { AOM_CDF4( 7906, 14170, 20618),  75 },
-      { AOM_CDF4( 4232,  8031, 11563), 118 },
+      { AOM_CDF4(11825, 18784, 22974),   0 },
+      { AOM_CDF4(10844, 17662, 22290),   0 },
+      { AOM_CDF4(10616, 16959, 21303),  90 },
+      { AOM_CDF4(11817, 17622, 21664),  90 },
+      { AOM_CDF4( 8267, 15623, 19902),  90 },
+      { AOM_CDF4( 5350,  9801, 14462),   5 },
+      { AOM_CDF4( 3443,  6585,  9559),  75 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7173,13 +7173,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(13565, 20175, 23969),   6 },
-      { AOM_CDF4(14915, 21720, 25323),   1 },
-      { AOM_CDF4(14811, 21829, 25442),   1 },
-      { AOM_CDF4(17080, 23526, 26837),   6 },
-      { AOM_CDF4(11230, 21285, 25544),   6 },
-      { AOM_CDF4( 9595, 17206, 23852),   6 },
-      { AOM_CDF4( 4734,  9118, 12740),   0 },
+      { AOM_CDF4(13939, 20762, 24451),  31 },
+      { AOM_CDF4(16243, 23219, 26714),  31 },
+      { AOM_CDF4(15074, 22210, 25984),   6 },
+      { AOM_CDF4(16107, 22725, 26296),   6 },
+      { AOM_CDF4(10893, 20273, 24826),   6 },
+      { AOM_CDF4( 5645, 10671, 15100),  30 },
+      { AOM_CDF4( 4335,  8679, 12492),  31 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7189,13 +7189,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(14807, 21467, 25087),  37 },
-      { AOM_CDF4(17538, 24141, 27259),  32 },
-      { AOM_CDF4(17050, 24088, 27344),  37 },
-      { AOM_CDF4(20445, 26394, 29010),  37 },
-      { AOM_CDF4(13038, 23823, 27523),  37 },
-      { AOM_CDF4(11652, 19430, 26443),  37 },
-      { AOM_CDF4( 5631, 10824, 15070),  32 },
+      { AOM_CDF4(14250, 21163, 24941),  37 },
+      { AOM_CDF4(17217, 23934, 27433),  32 },
+      { AOM_CDF4(17090, 23993, 27574),  37 },
+      { AOM_CDF4(19725, 25425, 28697),  37 },
+      { AOM_CDF4(12700, 23765, 28251),  37 },
+      { AOM_CDF4( 6542, 11855, 17108),  37 },
+      { AOM_CDF4( 5101, 10468, 15443),  37 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7239,13 +7239,13 @@
   },
   {
     {
-      { AOM_CDF4(14248, 21901, 26308),   1 },
-      { AOM_CDF4(13022, 20465, 24956),  75 },
-      { AOM_CDF4(14653, 21880, 25831),   1 },
-      { AOM_CDF4(19516, 25671, 28510),   1 },
-      { AOM_CDF4(11593, 24047, 28176),  75 },
-      { AOM_CDF4( 9850, 17630, 26824),  76 },
-      { AOM_CDF4( 7397, 13735, 18945),  75 },
+      { AOM_CDF4(15586, 23809, 28480),  31 },
+      { AOM_CDF4(13137, 22338, 27776),  26 },
+      { AOM_CDF4(12960, 20989, 27007),   1 },
+      { AOM_CDF4(14487, 22004, 26872),   1 },
+      { AOM_CDF4( 8977, 19506, 25832),   1 },
+      { AOM_CDF4( 6689, 13456, 20960),   7 },
+      { AOM_CDF4( 3660,  8043, 13467),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7255,13 +7255,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(16079, 23457, 27419),   1 },
-      { AOM_CDF4(16572, 23555, 27047),   0 },
-      { AOM_CDF4(17889, 24674, 27776),   0 },
-      { AOM_CDF4(21735, 27444, 29734),   1 },
-      { AOM_CDF4(12613, 25325, 29150),   1 },
-      { AOM_CDF4(10535, 18413, 27982),   1 },
-      { AOM_CDF4( 7357, 13755, 18923),   1 },
+      { AOM_CDF4(19250, 25820, 29038),  31 },
+      { AOM_CDF4(20479, 27597, 30639),  31 },
+      { AOM_CDF4(19284, 26800, 30037),  26 },
+      { AOM_CDF4(19120, 26676, 30033),  31 },
+      { AOM_CDF4(14799, 24819, 29256),  31 },
+      { AOM_CDF4(10041, 18099, 24102),  31 },
+      { AOM_CDF4( 6659, 13728, 19983),  31 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7271,13 +7271,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(14504, 21671, 25841),   1 },
-      { AOM_CDF4(15647, 22503, 26178),   1 },
-      { AOM_CDF4(17911, 24618, 27885),   1 },
-      { AOM_CDF4(22537, 27989, 30157),   1 },
-      { AOM_CDF4(13647, 26519, 29861),   7 },
-      { AOM_CDF4(12596, 20701, 28930),   7 },
-      { AOM_CDF4( 7622, 14270, 19564),  32 },
+      { AOM_CDF4(18981, 24347, 27397),  32 },
+      { AOM_CDF4(22083, 28198, 30532),  32 },
+      { AOM_CDF4(21589, 28346, 30716),  32 },
+      { AOM_CDF4(22576, 28726, 31113),  32 },
+      { AOM_CDF4(17332, 27607, 30702),  37 },
+      { AOM_CDF4(10788, 18280, 24206),  32 },
+      { AOM_CDF4( 7269, 15134, 21954),  62 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7321,13 +7321,13 @@
   },
   {
     {
-      { AOM_CDF4(22590, 28419, 31768),  62 },
-      { AOM_CDF4(21726, 28623, 32019),  50 },
-      { AOM_CDF4(26210, 31234, 32239),  50 },
-      { AOM_CDF4(30134, 31969, 32691),  60 },
-      { AOM_CDF4(16411, 30629, 32470),   0 },
-      { AOM_CDF4(17694, 22841, 32237),   0 },
-      { AOM_CDF4(18971, 25966, 30229),   0 },
+      { AOM_CDF4(32317, 32467, 32618),  62 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
+      { AOM_CDF4(26624, 28672, 30720),  50 },
+      { AOM_CDF4(32099, 32322, 32545),  50 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
+      { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7337,13 +7337,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(27538, 30088, 32024),  61 },
-      { AOM_CDF4(29185, 31266, 32369),  60 },
-      { AOM_CDF4(31081, 32206, 32656),  60 },
-      { AOM_CDF4(31912, 32577, 32721),  64 },
-      { AOM_CDF4(27172, 32035, 32635),  62 },
-      { AOM_CDF4(27637, 28991, 32525),  62 },
-      { AOM_CDF4(28323, 30227, 31455),  60 },
+      { AOM_CDF4(31284, 32482, 32636),  62 },
+      { AOM_CDF4(31915, 32524, 32727),  62 },
+      { AOM_CDF4(32202, 32681, 32724),  60 },
+      { AOM_CDF4(32241, 32717, 32748),  60 },
+      { AOM_CDF4(30064, 32611, 32737),  62 },
+      { AOM_CDF4(29352, 32394, 32715),  62 },
+      { AOM_CDF4(21876, 31279, 32303),  60 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7353,13 +7353,13 @@
       { AOM_CDF4( 8192, 16384, 24576),   0 },
     },
     {
-      { AOM_CDF4(30776, 32228, 32629),  62 },
-      { AOM_CDF4(31536, 32373, 32594),  50 },
-      { AOM_CDF4(31354, 32508, 32725),  50 },
-      { AOM_CDF4(32258, 32648, 32748),  62 },
-      { AOM_CDF4(28867, 32205, 32666),  60 },
-      { AOM_CDF4(30149, 31579, 32738),  60 },
-      { AOM_CDF4(29779, 31999, 32547),  60 },
+      { AOM_CDF4(32083, 32670, 32719),  60 },
+      { AOM_CDF4(32154, 32631, 32700),  60 },
+      { AOM_CDF4(31950, 32686, 32727),  60 },
+      { AOM_CDF4(32416, 32734, 32748),  60 },
+      { AOM_CDF4(31835, 32703, 32746),  62 },
+      { AOM_CDF4(30941, 32582, 32737),  60 },
+      { AOM_CDF4(28688, 32549, 32724),  60 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
       { AOM_CDF4( 8192, 16384, 24576),   0 },
@@ -7405,118 +7405,118 @@
 
 static const aom_cdf_prob av1_default_coeff_base_ph_cdfs[4][5][CDF_SIZE(4)] = {
   {
-    { AOM_CDF4(24042, 31545, 32441),  36 },
-    { AOM_CDF4(19171, 29453, 31810),   6 },
-    { AOM_CDF4(14480, 25963, 30210),   1 },
-    { AOM_CDF4(10198, 20797, 26612),  75 },
-    { AOM_CDF4( 5187, 11571, 16603),  78 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
   },
   {
-    { AOM_CDF4(25610, 31596, 32279),  31 },
-    { AOM_CDF4(21997, 30852, 32225),   1 },
-    { AOM_CDF4(16674, 27594, 30924),  75 },
-    { AOM_CDF4(11115, 22160, 27593),  75 },
-    { AOM_CDF4( 6144, 13550, 19120),  78 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
   },
   {
-    { AOM_CDF4(25832, 31464, 32273),  31 },
-    { AOM_CDF4(20809, 30221, 32040),   1 },
-    { AOM_CDF4(16254, 27425, 30735),  75 },
-    { AOM_CDF4(11807, 22693, 27863),  75 },
-    { AOM_CDF4( 6760, 14792, 20624),  75 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
   },
   {
-    { AOM_CDF4(21968, 30672, 32512),  32 },
-    { AOM_CDF4(18328, 29437, 31826),  76 },
-    { AOM_CDF4(15459, 27103, 30730),  75 },
-    { AOM_CDF4(11714, 22917, 28194),  75 },
-    { AOM_CDF4( 7108, 15722, 21972),  90 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
   },
 };
 
 static const aom_cdf_prob av1_default_v_txb_skip_cdfs[4][12][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2( 1925), 103 },
-    { AOM_CDF2( 6814),  95 },
-    { AOM_CDF2(15440),   1 },
-    { AOM_CDF2(  559),  50 },
-    { AOM_CDF2(10552),   0 },
-    { AOM_CDF2(30583),   0 },
-    { AOM_CDF2( 8138),  90 },
-    { AOM_CDF2(15535),  90 },
-    { AOM_CDF2(23596),  75 },
-    { AOM_CDF2(17114),  50 },
-    { AOM_CDF2(26785),   0 },
-    { AOM_CDF2(28672),   0 },
+    { AOM_CDF2( 1439),  78 },
+    { AOM_CDF2( 6191),   0 },
+    { AOM_CDF2(14610),   1 },
+    { AOM_CDF2(  180),  50 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2( 7648),  90 },
+    { AOM_CDF2(16148),  90 },
+    { AOM_CDF2(24565),  90 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
   },
   {
-    { AOM_CDF2(  964),  93 },
-    { AOM_CDF2( 6326),  75 },
-    { AOM_CDF2(16496),   1 },
-    { AOM_CDF2( 3332),  34 },
-    { AOM_CDF2(11334),  32 },
-    { AOM_CDF2(17641),  35 },
-    { AOM_CDF2( 7634),  75 },
-    { AOM_CDF2(14504),   0 },
-    { AOM_CDF2(22398),  75 },
-    { AOM_CDF2(12534),  10 },
-    { AOM_CDF2(17711),  37 },
-    { AOM_CDF2(21845),  45 },
+    { AOM_CDF2( 1341),  93 },
+    { AOM_CDF2( 7768),  75 },
+    { AOM_CDF2(16044),   1 },
+    { AOM_CDF2(  104),  60 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2( 8426),   0 },
+    { AOM_CDF2(16919),   0 },
+    { AOM_CDF2(25248),   0 },
+    { AOM_CDF2( 8448),  50 },
+    { AOM_CDF2(27163),  50 },
+    { AOM_CDF2(27594),  50 },
   },
   {
-    { AOM_CDF2( 1192),  93 },
-    { AOM_CDF2( 7341),  75 },
-    { AOM_CDF2(15515),   0 },
-    { AOM_CDF2( 1380),   1 },
-    { AOM_CDF2( 4501),  37 },
-    { AOM_CDF2(11822),  32 },
-    { AOM_CDF2( 8035),  90 },
-    { AOM_CDF2(12970),  75 },
-    { AOM_CDF2(18643),  75 },
-    { AOM_CDF2(13852),  32 },
-    { AOM_CDF2(16425),   7 },
-    { AOM_CDF2(17196),  32 },
+    { AOM_CDF2(  777),  93 },
+    { AOM_CDF2( 6871),  75 },
+    { AOM_CDF2(15620),   0 },
+    { AOM_CDF2( 1146),  35 },
+    { AOM_CDF2(14000),  25 },
+    { AOM_CDF2(24576),  50 },
+    { AOM_CDF2( 4536),  90 },
+    { AOM_CDF2(13035),  75 },
+    { AOM_CDF2(21755),  75 },
+    { AOM_CDF2( 5906),  35 },
+    { AOM_CDF2(18536),  25 },
+    { AOM_CDF2(26466),  50 },
   },
   {
-    { AOM_CDF2( 1362),  90 },
-    { AOM_CDF2( 5405),   0 },
-    { AOM_CDF2(10235),  75 },
-    { AOM_CDF2(  987),  76 },
-    { AOM_CDF2( 4061),   7 },
-    { AOM_CDF2( 6884),  37 },
-    { AOM_CDF2( 8915),  76 },
-    { AOM_CDF2(12716),  75 },
-    { AOM_CDF2(16989),  75 },
-    { AOM_CDF2(14550),  34 },
-    { AOM_CDF2(16220),   9 },
-    { AOM_CDF2(18128),  47 },
+    { AOM_CDF2(  606),  90 },
+    { AOM_CDF2( 6309),   0 },
+    { AOM_CDF2(13697),   1 },
+    { AOM_CDF2(  801),  10 },
+    { AOM_CDF2(10893),  25 },
+    { AOM_CDF2(19895),  50 },
+    { AOM_CDF2( 6221),  76 },
+    { AOM_CDF2(13720),  75 },
+    { AOM_CDF2(20139),  75 },
+    { AOM_CDF2( 7333),  60 },
+    { AOM_CDF2(20045),  25 },
+    { AOM_CDF2(24485),  50 },
   },
 };
 
 static const aom_cdf_prob default_intra_dip_cdf[4][3][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2( 6048),   0 },
-    { AOM_CDF2( 4529),   0 },
-    { AOM_CDF2( 5181),   0 },
+    { AOM_CDF2(13133),  56 },
+    { AOM_CDF2( 5577),   0 },
+    { AOM_CDF2( 4354),   0 },
   },
   {
-    { AOM_CDF2( 8596),   0 },
-    { AOM_CDF2( 8006),   0 },
-    { AOM_CDF2( 7168),   0 },
+    { AOM_CDF2( 8419),  31 },
+    { AOM_CDF2( 4256),   5 },
+    { AOM_CDF2( 2789),   5 },
   },
   {
-    { AOM_CDF2( 9008),   0 },
-    { AOM_CDF2(11031),   0 },
-    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2( 5199),  31 },
+    { AOM_CDF2( 2454),  30 },
+    { AOM_CDF2( 1763),  30 },
   },
   {
-    { AOM_CDF2(26870),   0 },
-    { AOM_CDF2(21845),   0 },
-    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(11914),  31 },
+    { AOM_CDF2( 5128),  31 },
+    { AOM_CDF2( 3555),  31 },
   },
 };
 
-static const aom_cdf_prob default_intra_dip_mode_n6_cdf[CDF_SIZE(6)] = { AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 };
+static const aom_cdf_prob default_intra_dip_mode_n6_cdf[CDF_SIZE(6)] = { AOM_CDF6( 5753, 15408, 19070, 22631, 27578),   0 };
 
 /* clang-format on */
 #ifdef __cplusplus
diff --git a/av1/common/entropy_inits_modes.h b/av1/common/entropy_inits_modes.h
index 36fdc59..9757084 100644
--- a/av1/common/entropy_inits_modes.h
+++ b/av1/common/entropy_inits_modes.h
@@ -21,22 +21,22 @@
 /* clang-format off */
 
 static const aom_cdf_prob default_inter_single_mode_cdf[5][CDF_SIZE(3)] = {
-  { AOM_CDF3(11516, 11715),   0 },
-  { AOM_CDF3(24656, 24680),   0 },
-  { AOM_CDF3(27225, 27243),   0 },
-  { AOM_CDF3(13331, 13366),   0 },
-  { AOM_CDF3(16063, 16170),   0 },
+  { AOM_CDF3(10043, 11100),   6 },
+  { AOM_CDF3(21561, 21758),   1 },
+  { AOM_CDF3(25411, 25714),   0 },
+  { AOM_CDF3(14117, 14341),   0 },
+  { AOM_CDF3(18288, 18577),   0 },
 };
 
 static const aom_cdf_prob default_inter_warp_mode_cdf[5][CDF_SIZE(2)] = {
-  { AOM_CDF2(31021), 118 },
-  { AOM_CDF2(25430),  76 },
-  { AOM_CDF2(22319),  76 },
-  { AOM_CDF2(21114),   1 },
-  { AOM_CDF2(17583),   1 },
+  { AOM_CDF2(25999),   1 },
+  { AOM_CDF2(14478),   7 },
+  { AOM_CDF2(10868),   6 },
+  { AOM_CDF2( 5256),  31 },
+  { AOM_CDF2( 2722),  31 },
 };
 
-static const aom_cdf_prob default_is_warpmv_or_warp_newmv_cdf[CDF_SIZE(2)] = { AOM_CDF2(11941),   0 };
+static const aom_cdf_prob default_is_warpmv_or_warp_newmv_cdf[CDF_SIZE(2)] = { AOM_CDF2(15095),   1 };
 
 static const aom_cdf_prob default_refinemv_flag_cdf[24][CDF_SIZE(2)] = {
   { AOM_CDF2(16384),   0 },
@@ -47,9 +47,9 @@
   { AOM_CDF2(16384),   0 },
   { AOM_CDF2(16384),   0 },
   { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
+  { AOM_CDF2(20204),  25 },
+  { AOM_CDF2(17614),  43 },
+  { AOM_CDF2(24443),  32 },
   { AOM_CDF2(16384),   0 },
   { AOM_CDF2(16384),   0 },
   { AOM_CDF2(16384),   0 },
@@ -67,72 +67,72 @@
 
 static const aom_cdf_prob default_drl_cdf[3][5][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2(20581), 118 },
-    { AOM_CDF2(25770),  90 },
-    { AOM_CDF2(27043),  75 },
-    { AOM_CDF2(22024), 118 },
-    { AOM_CDF2(16590), 118 },
+    { AOM_CDF2(15721),  90 },
+    { AOM_CDF2(21115),   0 },
+    { AOM_CDF2(19567),   1 },
+    { AOM_CDF2(17602),  93 },
+    { AOM_CDF2(13319),  93 },
   },
   {
-    { AOM_CDF2(20638), 118 },
-    { AOM_CDF2(20418),  90 },
-    { AOM_CDF2(21113), 115 },
-    { AOM_CDF2(19645), 123 },
-    { AOM_CDF2(19650),  90 },
+    { AOM_CDF2(18692),  93 },
+    { AOM_CDF2(19343),  90 },
+    { AOM_CDF2(18207),  90 },
+    { AOM_CDF2(17908),  93 },
+    { AOM_CDF2(18304),  93 },
   },
   {
-    { AOM_CDF2(26306),  90 },
-    { AOM_CDF2(25139), 115 },
-    { AOM_CDF2(23285),  76 },
-    { AOM_CDF2(26265), 115 },
-    { AOM_CDF2(23464), 118 },
+    { AOM_CDF2(22157),  90 },
+    { AOM_CDF2(23233),  90 },
+    { AOM_CDF2(22782),  90 },
+    { AOM_CDF2(22353),  93 },
+    { AOM_CDF2(22457),  93 },
   },
 };
 
 static const aom_cdf_prob default_tip_drl_cdf[3][CDF_SIZE(2)] = {
-  { AOM_CDF2(31561),   0 },
-  { AOM_CDF2(27203),   0 },
-  { AOM_CDF2(21916),   0 },
+  { AOM_CDF2(30662),   0 },
+  { AOM_CDF2(23823),   6 },
+  { AOM_CDF2(21676),   6 },
 };
 
 static const aom_cdf_prob default_skip_drl_cdf[3][CDF_SIZE(2)] = {
-  { AOM_CDF2(25396),   0 },
-  { AOM_CDF2(23881),   0 },
-  { AOM_CDF2(21508),   0 },
+  { AOM_CDF2(21634),   0 },
+  { AOM_CDF2(17376),   0 },
+  { AOM_CDF2(18432),  75 },
 };
 
 static const aom_cdf_prob default_use_optflow_cdf[2][CDF_SIZE(2)] = {
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
+  { AOM_CDF2(11582),  31 },
+  { AOM_CDF2(24076),  26 },
 };
 
 static const aom_cdf_prob default_inter_compound_mode_is_joint_cdf[2][CDF_SIZE(2)] = {
-  { AOM_CDF2(25397),   0 },
-  { AOM_CDF2(32752),   0 },
+  { AOM_CDF2(24720),   0 },
+  { AOM_CDF2(32764),   0 },
 };
 
 static const aom_cdf_prob default_inter_compound_mode_non_joint_type_cdf[5][CDF_SIZE(5)] = {
-  { AOM_CDF5(14431, 21078, 25375, 27262),   0 },
-  { AOM_CDF5(22433, 25805, 28788, 30114),   0 },
-  { AOM_CDF5(25873, 28046, 30292, 31275),   0 },
-  { AOM_CDF5(17660, 22114, 26307, 27200),   0 },
-  { AOM_CDF5(21832, 24917, 28451, 28996),   0 },
+  { AOM_CDF5(12177, 20001, 23193, 24448),  26 },
+  { AOM_CDF5(21192, 25117, 27806, 27948),  31 },
+  { AOM_CDF5(26779, 28724, 30192, 30249),  25 },
+  { AOM_CDF5(12506, 17871, 21295, 21389),  31 },
+  { AOM_CDF5(16948, 20335, 22582, 22617),  31 },
 };
 
 static const aom_cdf_prob default_inter_compound_mode_same_refs_cdf[5][CDF_SIZE(4)] = {
-  { AOM_CDF4(10155, 29278, 29355),   0 },
-  { AOM_CDF4(16755, 29980, 30097),   0 },
-  { AOM_CDF4(20563, 30064, 30344),   0 },
-  { AOM_CDF4(12042, 28942, 29047),   0 },
-  { AOM_CDF4(13526, 28071, 28214),   0 },
+  { AOM_CDF4( 6386, 23344, 23348),  31 },
+  { AOM_CDF4(10945, 24709, 24714),  31 },
+  { AOM_CDF4(11517, 25230, 25258),  31 },
+  { AOM_CDF4( 7563, 22176, 22180),  31 },
+  { AOM_CDF4( 6629, 20955, 20966),   6 },
 };
 
 static const aom_cdf_prob default_cwp_idx_cdf[2][4][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2(13851),  31 },
-    { AOM_CDF2(15058),  31 },
-    { AOM_CDF2(21728),  31 },
-    { AOM_CDF2(21219),  31 },
+    { AOM_CDF2(21704),  56 },
+    { AOM_CDF2(15990),  31 },
+    { AOM_CDF2(12544),  57 },
+    { AOM_CDF2(25638),  62 },
   },
   {
     { AOM_CDF2(16384),   0 },
@@ -142,319 +142,319 @@
   },
 };
 
-static const aom_cdf_prob default_jmvd_scale_mode_cdf[CDF_SIZE(5)] = { AOM_CDF5(18498, 21150, 23573, 28129),   1 };
+static const aom_cdf_prob default_jmvd_scale_mode_cdf[CDF_SIZE(5)] = { AOM_CDF5(23180, 24894, 26548, 29872),   1 };
 
-static const aom_cdf_prob default_jmvd_amvd_scale_mode_cdf[CDF_SIZE(3)] = { AOM_CDF3(24903, 28074),  75 };
+static const aom_cdf_prob default_jmvd_amvd_scale_mode_cdf[CDF_SIZE(3)] = { AOM_CDF3(23178, 26812),   0 };
 
-static const aom_cdf_prob default_compound_type_cdf[CDF_SIZE(2)] = { AOM_CDF2(18804),   6 };
+static const aom_cdf_prob default_compound_type_cdf[CDF_SIZE(2)] = { AOM_CDF2(16894),  31 };
 
 static const aom_cdf_prob default_amvd_mode_cdf[9][3][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2(11007),   0 },
-    { AOM_CDF2(11114),   0 },
-    { AOM_CDF2(10230),   0 },
+    { AOM_CDF2( 5980),  15 },
+    { AOM_CDF2( 6091),  15 },
+    { AOM_CDF2( 6237),  93 },
   },
   {
-    { AOM_CDF2(11219),   0 },
-    { AOM_CDF2(10158),   0 },
-    { AOM_CDF2(10997),   0 },
+    { AOM_CDF2(  861),  30 },
+    { AOM_CDF2(  847),  50 },
+    { AOM_CDF2( 1198),  66 },
   },
   {
-    { AOM_CDF2( 8100),   0 },
-    { AOM_CDF2( 6742),   0 },
-    { AOM_CDF2( 9818),   0 },
+    { AOM_CDF2(  456),  53 },
+    { AOM_CDF2(  431),  68 },
+    { AOM_CDF2(  849),  68 },
   },
   {
-    { AOM_CDF2( 7594),   0 },
-    { AOM_CDF2( 6653),   0 },
-    { AOM_CDF2( 7058),   0 },
+    { AOM_CDF2(  409),  68 },
+    { AOM_CDF2(  385),  68 },
+    { AOM_CDF2(  581),  68 },
   },
   {
-    { AOM_CDF2(17652),   0 },
-    { AOM_CDF2(14448),   0 },
-    { AOM_CDF2(13409),   0 },
+    { AOM_CDF2(16246),   0 },
+    { AOM_CDF2( 9696),   0 },
+    { AOM_CDF2( 8791),   0 },
   },
   {
-    { AOM_CDF2(14808),   0 },
-    { AOM_CDF2(13708),   0 },
-    { AOM_CDF2(13027),   0 },
+    { AOM_CDF2(13199),   0 },
+    { AOM_CDF2(10624),   0 },
+    { AOM_CDF2( 8586),   1 },
   },
   {
-    { AOM_CDF2( 8699),   0 },
-    { AOM_CDF2( 7036),   0 },
-    { AOM_CDF2( 7728),   0 },
+    { AOM_CDF2( 5112),   1 },
+    { AOM_CDF2( 3920),   3 },
+    { AOM_CDF2( 3668),   3 },
   },
   {
-    { AOM_CDF2( 9396),   0 },
-    { AOM_CDF2( 8093),   0 },
-    { AOM_CDF2(10339),   0 },
+    { AOM_CDF2(12017),  76 },
+    { AOM_CDF2(10177),  75 },
+    { AOM_CDF2( 9184),  75 },
   },
   {
-    { AOM_CDF2(13855),   0 },
-    { AOM_CDF2(11902),   0 },
-    { AOM_CDF2(11445),   0 },
+    { AOM_CDF2(12111),   6 },
+    { AOM_CDF2( 8056),   5 },
+    { AOM_CDF2( 6641),  27 },
   },
 };
 
-static const aom_cdf_prob default_wedge_quad_cdf[CDF_SIZE(4)] = { AOM_CDF4( 9105, 18210, 25489),  93 };
+static const aom_cdf_prob default_wedge_quad_cdf[CDF_SIZE(4)] = { AOM_CDF4( 6511, 18144, 27374),   1 };
 
 static const aom_cdf_prob default_wedge_angle_cdf[4][CDF_SIZE(5)] = {
-  { AOM_CDF5( 6495, 14916, 23085, 27549),  76 },
-  { AOM_CDF5(12000, 15000, 22500, 28500),  76 },
-  { AOM_CDF5(16520, 21143, 25198, 28761),  76 },
-  { AOM_CDF5(13800, 16100, 23000, 27600),  76 },
+  { AOM_CDF5(10258, 15276, 19997, 26561),   6 },
+  { AOM_CDF5(14039, 19183, 26143, 30047),   6 },
+  { AOM_CDF5(19564, 22099, 25104, 29960),   1 },
+  { AOM_CDF5(13808, 17950, 25715, 29008),   7 },
 };
 
-static const aom_cdf_prob default_wedge_dist_cdf[CDF_SIZE(4)] = { AOM_CDF4( 5746, 15860, 20435),  75 };
+static const aom_cdf_prob default_wedge_dist_cdf[CDF_SIZE(4)] = { AOM_CDF4( 8203, 16994, 21032),  75 };
 
-static const aom_cdf_prob default_wedge_dist_cdf2[CDF_SIZE(3)] = { AOM_CDF3(11164, 18454),  90 };
+static const aom_cdf_prob default_wedge_dist_cdf2[CDF_SIZE(3)] = { AOM_CDF3(14463, 19115),  75 };
 
 static const aom_cdf_prob default_warp_interintra_cdf[4][CDF_SIZE(2)] = {
   { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
+  { AOM_CDF2(27980),  56 },
+  { AOM_CDF2(29163),  56 },
+  { AOM_CDF2(30658),  62 },
 };
 
 static const aom_cdf_prob default_interintra_cdf[4][CDF_SIZE(2)] = {
-  { AOM_CDF2(30376),  75 },
-  { AOM_CDF2(20784),   1 },
-  { AOM_CDF2(22326),   1 },
-  { AOM_CDF2(24412),   1 },
+  { AOM_CDF2(20569),   1 },
+  { AOM_CDF2(17106),   1 },
+  { AOM_CDF2(20948),   1 },
+  { AOM_CDF2(25796),  32 },
 };
 
-static const aom_cdf_prob default_wedge_interintra_cdf[CDF_SIZE(2)] = { AOM_CDF2(14247),  75 };
+static const aom_cdf_prob default_wedge_interintra_cdf[CDF_SIZE(2)] = { AOM_CDF2(16758),   0 };
 
 static const aom_cdf_prob default_interintra_mode_cdf[4][CDF_SIZE(4)] = {
-  { AOM_CDF4( 5420, 20952, 31034),   7 },
-  { AOM_CDF4( 1948, 17325, 31146),  75 },
-  { AOM_CDF4( 3623, 17784, 29374),   1 },
-  { AOM_CDF4( 2843, 14004, 27752),   7 },
+  { AOM_CDF4( 1819, 16131, 26802),  32 },
+  { AOM_CDF4( 1442, 15840, 28441),   1 },
+  { AOM_CDF4( 1995, 15814, 28221),   7 },
+  { AOM_CDF4( 3564, 15440, 28048),  32 },
 };
 
 static const aom_cdf_prob default_warp_ref_idx0_cdf[1][CDF_SIZE(2)] = {
-  { AOM_CDF2(21704),  90 },
+  { AOM_CDF2(18903),   0 },
 };
 
 static const aom_cdf_prob default_warp_ref_idx1_cdf[1][CDF_SIZE(2)] = {
-  { AOM_CDF2(23581), 115 },
+  { AOM_CDF2(24500),  90 },
 };
 
 static const aom_cdf_prob default_warp_ref_idx2_cdf[1][CDF_SIZE(2)] = {
-  { AOM_CDF2(21767), 123 },
+  { AOM_CDF2(25360),  75 },
 };
 
 static const aom_cdf_prob default_warp_causal_cdf[4][CDF_SIZE(2)] = {
-  { AOM_CDF2(17055),   0 },
-  { AOM_CDF2(20889),   0 },
-  { AOM_CDF2(17980),   0 },
-  { AOM_CDF2(17863),   0 },
+  { AOM_CDF2(14877),   1 },
+  { AOM_CDF2(12801),   0 },
+  { AOM_CDF2( 6885),   6 },
+  { AOM_CDF2( 2987),  30 },
 };
 
 static const aom_cdf_prob default_warp_precision_idx_cdf[31][CDF_SIZE(2)] = {
   { AOM_CDF2(16384),   0 },
   { AOM_CDF2(16384),   0 },
   { AOM_CDF2(16384),   0 },
+  { AOM_CDF2(31107),  56 },
+  { AOM_CDF2(27357),  31 },
+  { AOM_CDF2(26435),  26 },
+  { AOM_CDF2(22585),  26 },
+  { AOM_CDF2(20146),  27 },
+  { AOM_CDF2(18671),  32 },
+  { AOM_CDF2(18210),  32 },
+  { AOM_CDF2(17968),  25 },
+  { AOM_CDF2(17451),  40 },
+  { AOM_CDF2(16736),  25 },
+  { AOM_CDF2(16040),  25 },
+  { AOM_CDF2(15633),  25 },
+  { AOM_CDF2(13952),  25 },
+  { AOM_CDF2(14893),  25 },
+  { AOM_CDF2(13323),  25 },
+  { AOM_CDF2(11830),  50 },
   { AOM_CDF2(16384),   0 },
   { AOM_CDF2(16384),   0 },
+  { AOM_CDF2(21783),  28 },
+  { AOM_CDF2(20345),  15 },
+  { AOM_CDF2(19398),  25 },
+  { AOM_CDF2(17823),  35 },
   { AOM_CDF2(16384),   0 },
   { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(16384),   0 },
+  { AOM_CDF2(20066),  25 },
+  { AOM_CDF2(18893),   5 },
   { AOM_CDF2(16384),   0 },
   { AOM_CDF2(16384),   0 },
 };
 
 static const aom_cdf_prob default_warp_delta_param_cdf[2][CDF_SIZE(8)] = {
-  { AOM_CDF8( 9210, 20919, 23883, 28837, 29680, 31427, 31670),   0 },
-  { AOM_CDF8(12722, 22620, 25595, 29576, 30362, 31750, 31968),   0 },
+  { AOM_CDF8( 8995, 22970, 25406, 29673, 30295, 31670, 31863),   0 },
+  { AOM_CDF8(13333, 24012, 26545, 30183, 30839, 31958, 32139),   0 },
 };
 
 static const aom_cdf_prob default_warp_delta_param_high_cdf[2][CDF_SIZE(8)] = {
-  { AOM_CDF8( 7419, 12373, 17584, 20281, 23728, 27184, 29430),   0 },
-  { AOM_CDF8( 7417, 12119, 17352, 20027, 23490, 26882, 29213),   0 },
+  { AOM_CDF8( 8959, 14388, 19825, 21810, 25035, 28077, 29469),  15 },
+  { AOM_CDF8( 9199, 14146, 19484, 21591, 24614, 28015, 29538),   0 },
 };
 
-static const aom_cdf_prob default_warp_param_sign_cdf[CDF_SIZE(2)] = { AOM_CDF2(16384),   0 };
+static const aom_cdf_prob default_warp_param_sign_cdf[CDF_SIZE(2)] = { AOM_CDF2(14285),  93 };
 
 static const aom_cdf_prob default_warp_extend_cdf[3][CDF_SIZE(2)] = {
-  { AOM_CDF2(20856),   0 },
-  { AOM_CDF2(18023),   0 },
-  { AOM_CDF2(16560),   0 },
+  { AOM_CDF2(20359),   0 },
+  { AOM_CDF2(20310),  75 },
+  { AOM_CDF2(21759),  75 },
 };
 
-static const aom_cdf_prob default_warpmv_with_mvd_flag_cdf[CDF_SIZE(2)] = { AOM_CDF2(16283),   0 };
+static const aom_cdf_prob default_warpmv_with_mvd_flag_cdf[CDF_SIZE(2)] = { AOM_CDF2(18452),   1 };
 
 static const aom_cdf_prob default_bawp_cdf[2][CDF_SIZE(2)] = {
-  { AOM_CDF2(27422),   1 },
-  { AOM_CDF2(15131),   6 },
+  { AOM_CDF2(26456),  31 },
+  { AOM_CDF2( 5121),  31 },
 };
 
 static const aom_cdf_prob default_explicit_bawp_cdf[3][CDF_SIZE(2)] = {
-  { AOM_CDF2(19664),   0 },
-  { AOM_CDF2(21664),   0 },
-  { AOM_CDF2(23664),   0 },
+  { AOM_CDF2(26966),  31 },
+  { AOM_CDF2(15275),   6 },
+  { AOM_CDF2(14613),  31 },
 };
 
-static const aom_cdf_prob default_explicit_bawp_scale_cdf[CDF_SIZE(2)] = { AOM_CDF2(16384),   0 };
+static const aom_cdf_prob default_explicit_bawp_scale_cdf[CDF_SIZE(2)] = { AOM_CDF2(21998),  32 };
 
 static const aom_cdf_prob default_tip_cdf[3][CDF_SIZE(2)] = {
-  { AOM_CDF2(31852), 118 },
-  { AOM_CDF2(18438),  90 },
-  { AOM_CDF2( 8752),  90 },
+  { AOM_CDF2(30898),  93 },
+  { AOM_CDF2(19665),   0 },
+  { AOM_CDF2( 9477),  15 },
 };
 
-static const aom_cdf_prob default_tip_pred_mode_cdf[CDF_SIZE(2)] = { AOM_CDF2(29069),   0 };
+static const aom_cdf_prob default_tip_pred_mode_cdf[CDF_SIZE(2)] = { AOM_CDF2(22129),  31 };
 
-static const aom_cdf_prob default_palette_y_size_cdf[CDF_SIZE(7)] = { AOM_CDF7( 7882, 14719, 20582, 24895, 28455, 30765),  70 };
+static const aom_cdf_prob default_palette_y_size_cdf[CDF_SIZE(7)] = { AOM_CDF7( 8779, 15095, 20777, 24903, 27923, 30403),  32 };
 
-static const aom_cdf_prob default_palette_uv_size_cdf[CDF_SIZE(7)] = { AOM_CDF7( 8195, 19832, 25803, 29025, 30747, 31974),  50 };
+static const aom_cdf_prob default_palette_uv_size_cdf[CDF_SIZE(7)] = { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 };
 
 static const aom_cdf_prob default_identity_row_cdf_y[4][CDF_SIZE(3)] = {
-  { AOM_CDF3(10923, 21845),  25 },
-  { AOM_CDF3(10923, 21845),  31 },
-  { AOM_CDF3(10923, 21845),  33 },
-  { AOM_CDF3(10923, 21845),  36 },
+  { AOM_CDF3(22515, 25751),  25 },
+  { AOM_CDF3( 4014,  5233),  31 },
+  { AOM_CDF3( 3548,  4163),  33 },
+  { AOM_CDF3(12999, 32756),  56 },
 };
 
 static const aom_cdf_prob default_identity_row_cdf_uv[4][CDF_SIZE(3)] = {
-  { AOM_CDF3(10923, 21845),  32 },
-  { AOM_CDF3(10923, 21845),  57 },
-  { AOM_CDF3(10923, 21845),  30 },
-  { AOM_CDF3(10923, 21845),  56 },
+  { AOM_CDF3(10923, 21845),   0 },
+  { AOM_CDF3(10923, 21845),   0 },
+  { AOM_CDF3(10923, 21845),   0 },
+  { AOM_CDF3(10923, 21845),   0 },
 };
 
 static const aom_cdf_prob default_palette_y_color_index_cdf[PALETTE_SIZES][PALETTE_COLOR_INDEX_CONTEXTS][CDF_SIZE(PALETTE_COLORS)] = {
 {
-  { AOM_CDF2(27953), 120 },
+  { AOM_CDF2(28140),  90 },
   { AOM_CDF2(16384),   0 },
-  { AOM_CDF2( 8822),  60 },
-  { AOM_CDF2(27664),  25 },
-  { AOM_CDF2(30470),   0 },
+  { AOM_CDF2( 8582),   6 },
+  { AOM_CDF2(27413),  32 },
+  { AOM_CDF2(30429),  93 },
 },
 {
-  { AOM_CDF3(25275, 28972),  70 },
-  { AOM_CDF3(12296, 25651),  85 },
-  { AOM_CDF3( 7235, 28020),  45 },
-  { AOM_CDF3(20976, 25896),  50 },
-  { AOM_CDF3(30329, 31531),  60 },
+  { AOM_CDF3(25350, 29026),  90 },
+  { AOM_CDF3(11363, 25273),   7 },
+  { AOM_CDF3( 6841, 28579),   1 },
+  { AOM_CDF3(21350, 26012),   6 },
+  { AOM_CDF3(30573, 31646),  93 },
 },
 {
-  { AOM_CDF4(23381, 26612, 28974),  70 },
-  { AOM_CDF4(10717, 22776, 27574),  70 },
-  { AOM_CDF4( 6423, 25697, 29375), 110 },
-  { AOM_CDF4(19518, 23623, 28343),  60 },
-  { AOM_CDF4(30332, 31099, 31857),  50 },
+  { AOM_CDF4(23706, 26962, 29060),   0 },
+  { AOM_CDF4( 9976, 22516, 27382),   1 },
+  { AOM_CDF4( 6691, 25460, 29234),   6 },
+  { AOM_CDF4(18909, 23925, 28403),  31 },
+  { AOM_CDF4(30308, 31076, 31818),  93 },
 },
 {
-  { AOM_CDF5(23985, 26707, 28381, 29936),  60 },
-  { AOM_CDF5( 9530, 19953, 23789, 28724),  60 },
-  { AOM_CDF5( 6047, 24926, 27833, 30371),   0 },
-  { AOM_CDF5(20148, 23267, 27043, 28890),  70 },
-  { AOM_CDF5(30829, 31286, 31746, 32197),   0 },
+  { AOM_CDF5(24116, 26957, 28486, 29941),   0 },
+  { AOM_CDF5( 9568, 20472, 24294, 28942),  81 },
+  { AOM_CDF5( 5706, 25243, 28040, 30406),  76 },
+  { AOM_CDF5(20105, 22982, 27024, 28911),  31 },
+  { AOM_CDF5(30897, 31342, 31766, 32199),  93 },
 },
 {
-  { AOM_CDF6(21093, 24342, 26015, 27567, 29307),   0 },
-  { AOM_CDF6( 8394, 18615, 21558, 26002, 28573),  50 },
-  { AOM_CDF6( 5813, 23913, 26226, 28289, 30468),  10 },
-  { AOM_CDF6(19001, 22337, 25424, 26705, 28663),  50 },
-  { AOM_CDF6(30558, 31067, 31403, 31756, 32196),  60 },
+  { AOM_CDF6(20824, 24227, 25926, 27459, 29266),  75 },
+  { AOM_CDF6( 8141, 18989, 21599, 26182, 28576),  75 },
+  { AOM_CDF6( 5252, 24340, 26450, 28438, 30625),  75 },
+  { AOM_CDF6(19519, 22695, 25587, 26972, 28423),   6 },
+  { AOM_CDF6(30383, 30890, 31247, 31653, 32150),  78 },
 },
 {
-  { AOM_CDF7(22109, 24619, 25982, 27240, 28446, 29822),  60 },
-  { AOM_CDF7( 8462, 18350, 20440, 25007, 26774, 28765),   0 },
-  { AOM_CDF7( 6112, 23012, 25022, 26868, 28683, 30708),   0 },
-  { AOM_CDF7(22602, 24933, 27205, 28064, 28697, 29814), 100 },
-  { AOM_CDF7(30803, 31187, 31462, 31737, 32020, 32331),  50 },
+  { AOM_CDF7(21628, 24512, 25873, 27054, 28131, 29539),  80 },
+  { AOM_CDF7( 8028, 18264, 20613, 25424, 27112, 28906),  90 },
+  { AOM_CDF7( 6489, 22242, 24461, 26394, 28350, 30510),  75 },
+  { AOM_CDF7(22048, 24429, 26990, 27944, 28417, 29574),  76 },
+  { AOM_CDF7(30801, 31205, 31472, 31728, 32005, 32305),  93 },
 },
 {
-  { AOM_CDF8(22076, 24783, 25777, 26792, 27691, 28748, 29942),  50 },
-  { AOM_CDF8( 8293, 17397, 19329, 23699, 25608, 27188, 28865),   0 },
-  { AOM_CDF8( 7220, 21444, 23642, 25420, 27182, 28981, 30832),   0 },
-  { AOM_CDF8(23128, 24999, 27546, 28542, 29286, 29744, 30499),  50 },
-  { AOM_CDF8(30626, 30964, 31219, 31444, 31661, 31956, 32318),  10 },
+  { AOM_CDF8(22471, 25083, 25984, 26893, 27654, 28750, 29903),  93 },
+  { AOM_CDF8( 7542, 17057, 19151, 23550, 25459, 27066, 28804),  90 },
+  { AOM_CDF8( 7582, 20437, 22728, 24622, 26515, 28579, 30632),  90 },
+  { AOM_CDF8(22102, 24144, 26916, 28151, 28846, 29212, 30153),   0 },
+  { AOM_CDF8(30524, 30887, 31156, 31393, 31626, 31911, 32281),  93 },
 },
 };
 
-static const aom_cdf_prob default_palette_y_mode_cdf[CDF_SIZE(2)] = { AOM_CDF2(24488),  55 };
+static const aom_cdf_prob default_palette_y_mode_cdf[CDF_SIZE(2)] = { AOM_CDF2(30045),  62 };
 
-static const aom_cdf_prob default_palette_uv_mode_cdf[CDF_SIZE(2)] = { AOM_CDF2(30790),  50 };
+static const aom_cdf_prob default_palette_uv_mode_cdf[CDF_SIZE(2)] = { AOM_CDF2(16384),   0 };
 
 static const aom_cdf_prob default_comp_inter_cdf[5][CDF_SIZE(2)] = {
-  { AOM_CDF2(27078),  75 },
-  { AOM_CDF2(22913),   1 },
-  { AOM_CDF2(15254),   1 },
-  { AOM_CDF2(13473),   1 },
-  { AOM_CDF2( 5765),   0 },
+  { AOM_CDF2(26924),  15 },
+  { AOM_CDF2(25000),   1 },
+  { AOM_CDF2(17949),   1 },
+  { AOM_CDF2(13581),   6 },
+  { AOM_CDF2( 7034),   0 },
 };
 
 static const aom_cdf_prob default_single_ref_cdf[3][6][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2(27505),   0 },
-    { AOM_CDF2(26743),   0 },
-    { AOM_CDF2(29193),  75 },
-    { AOM_CDF2(29517),   0 },
-    { AOM_CDF2(30241),   0 },
-    { AOM_CDF2(30024),   1 },
+    { AOM_CDF2(26469),   0 },
+    { AOM_CDF2(28870),  30 },
+    { AOM_CDF2(29662),   1 },
+    { AOM_CDF2(29867),   6 },
+    { AOM_CDF2(29772),   6 },
+    { AOM_CDF2(29776),  26 },
   },
   {
-    { AOM_CDF2(17869),   1 },
-    { AOM_CDF2(16112),   6 },
-    { AOM_CDF2(19968),   6 },
-    { AOM_CDF2(17247),  31 },
-    { AOM_CDF2(17293),  32 },
-    { AOM_CDF2(11155),  32 },
+    { AOM_CDF2(13631),   6 },
+    { AOM_CDF2(18185),  37 },
+    { AOM_CDF2(19992),  32 },
+    { AOM_CDF2(18462),  62 },
+    { AOM_CDF2(17451),  37 },
+    { AOM_CDF2(11578),  62 },
   },
   {
-    { AOM_CDF2( 6276),   0 },
-    { AOM_CDF2( 5153),   0 },
-    { AOM_CDF2( 6631),   1 },
-    { AOM_CDF2( 4257),   6 },
-    { AOM_CDF2( 3798),   1 },
-    { AOM_CDF2( 1983),   0 },
+    { AOM_CDF2( 2599),   0 },
+    { AOM_CDF2( 5203),  31 },
+    { AOM_CDF2( 5185),  31 },
+    { AOM_CDF2( 3671),  31 },
+    { AOM_CDF2( 3954),   6 },
+    { AOM_CDF2( 1633),   5 },
   },
 };
 
 static const aom_cdf_prob default_comp_ref0_cdf[3][6][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2(11015),  32 },
-    { AOM_CDF2(14938),  32 },
+    { AOM_CDF2( 9272),  32 },
+    { AOM_CDF2(17175),  62 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
   },
   {
-    { AOM_CDF2( 1829),  75 },
-    { AOM_CDF2( 3838),   6 },
+    { AOM_CDF2( 1385),   0 },
+    { AOM_CDF2( 4439),  31 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
   },
   {
-    { AOM_CDF2( 1233),  75 },
-    { AOM_CDF2( 1491),   0 },
+    { AOM_CDF2(  521),   0 },
+    { AOM_CDF2( 1854),  25 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
@@ -465,214 +465,214 @@
 static const aom_cdf_prob default_comp_ref1_cdf[3][2][6][CDF_SIZE(2)] = {
   {
     {
-      { AOM_CDF2(31947), 115 },
-      { AOM_CDF2(29267),   5 },
-      { AOM_CDF2(29617),   1 },
-      { AOM_CDF2(30617),  26 },
-      { AOM_CDF2(31720),   8 },
-      { AOM_CDF2(31208),  32 },
+      { AOM_CDF2(30729),  75 },
+      { AOM_CDF2(29403),   5 },
+      { AOM_CDF2(29037),   6 },
+      { AOM_CDF2(29355),  31 },
+      { AOM_CDF2(28573),   5 },
+      { AOM_CDF2(27396),   7 },
     },
     {
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(19512),  31 },
-      { AOM_CDF2(28511),   1 },
-      { AOM_CDF2(27987),  31 },
-      { AOM_CDF2(29764),  30 },
-      { AOM_CDF2(29015),  51 },
+      { AOM_CDF2(19315),  31 },
+      { AOM_CDF2(27821),   6 },
+      { AOM_CDF2(27892),  31 },
+      { AOM_CDF2(28695),  30 },
+      { AOM_CDF2(29637),  51 },
     },
   },
   {
     {
-      { AOM_CDF2(31833),  93 },
-      { AOM_CDF2(26128),  31 },
-      { AOM_CDF2(21282),  31 },
-      { AOM_CDF2(18036),  57 },
-      { AOM_CDF2(21050),  32 },
-      { AOM_CDF2(14939),  57 },
+      { AOM_CDF2(30432),   0 },
+      { AOM_CDF2(20290),  31 },
+      { AOM_CDF2(19855),  37 },
+      { AOM_CDF2(18567),  62 },
+      { AOM_CDF2(18331),  37 },
+      { AOM_CDF2(14241),  62 },
     },
     {
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2( 7402),   1 },
-      { AOM_CDF2(16893),   6 },
-      { AOM_CDF2(13997),  31 },
-      { AOM_CDF2(13067),  31 },
-      { AOM_CDF2( 7202),  57 },
+      { AOM_CDF2( 5725),  31 },
+      { AOM_CDF2(13420),  31 },
+      { AOM_CDF2(12780),  32 },
+      { AOM_CDF2(10781),  62 },
+      { AOM_CDF2( 6424),  62 },
     },
   },
   {
     {
-      { AOM_CDF2(26394),  31 },
-      { AOM_CDF2(15795),  31 },
-      { AOM_CDF2( 6816),  31 },
-      { AOM_CDF2( 3530),  57 },
-      { AOM_CDF2( 5621),  59 },
-      { AOM_CDF2( 2839),  71 },
+      { AOM_CDF2(11634),  31 },
+      { AOM_CDF2(10093),  31 },
+      { AOM_CDF2( 6065),  31 },
+      { AOM_CDF2( 5408),  31 },
+      { AOM_CDF2( 6411),  31 },
+      { AOM_CDF2( 4075),  30 },
     },
     {
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2( 1576),  93 },
-      { AOM_CDF2( 5081),   1 },
-      { AOM_CDF2( 2205),   6 },
-      { AOM_CDF2( 1859),   6 },
-      { AOM_CDF2(  925),   6 },
+      { AOM_CDF2(  898),  15 },
+      { AOM_CDF2( 3127),   1 },
+      { AOM_CDF2( 1775),   5 },
+      { AOM_CDF2( 1217),   6 },
+      { AOM_CDF2(  591),   5 },
     },
   },
 };
 
 static const aom_cdf_prob default_comp_group_idx_cdfs[12][CDF_SIZE(2)] = {
-  { AOM_CDF2( 9916),   0 },
-  { AOM_CDF2( 7647),   0 },
-  { AOM_CDF2( 4172),   0 },
-  { AOM_CDF2( 6353),   1 },
-  { AOM_CDF2( 3423),   0 },
-  { AOM_CDF2( 4917),   6 },
-  { AOM_CDF2(11013),   0 },
-  { AOM_CDF2( 5843),   0 },
-  { AOM_CDF2( 7222),   1 },
-  { AOM_CDF2( 3158),   1 },
-  { AOM_CDF2( 2495),   0 },
-  { AOM_CDF2( 4723),   3 },
+  { AOM_CDF2(17510),  26 },
+  { AOM_CDF2(10382),   0 },
+  { AOM_CDF2( 8336),  31 },
+  { AOM_CDF2( 6054),   1 },
+  { AOM_CDF2( 5764),   5 },
+  { AOM_CDF2( 7154),  10 },
+  { AOM_CDF2(15013),  26 },
+  { AOM_CDF2( 8426),   0 },
+  { AOM_CDF2( 8278),   1 },
+  { AOM_CDF2( 4856),   1 },
+  { AOM_CDF2( 3464),   0 },
+  { AOM_CDF2( 5295),   0 },
 };
 
 static const aom_cdf_prob default_skip_mode_cdfs[3][CDF_SIZE(2)] = {
-  { AOM_CDF2(31439),   0 },
-  { AOM_CDF2(22696),   0 },
-  { AOM_CDF2(12045),   0 },
+  { AOM_CDF2(30964),  93 },
+  { AOM_CDF2(21769),   0 },
+  { AOM_CDF2(12484),  15 },
 };
 
 static const aom_cdf_prob default_lossless_tx_size_cdf[4][2][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2(16384),   1 },
-    { AOM_CDF2(16384),   1 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
   },
   {
-    { AOM_CDF2(16384),  75 },
-    { AOM_CDF2(16384),  75 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
   },
   {
-    { AOM_CDF2(16384),  75 },
-    { AOM_CDF2(16384),  75 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
   },
   {
-    { AOM_CDF2(16384),  75 },
-    { AOM_CDF2(16384),  75 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
   },
 };
 
-static const aom_cdf_prob default_lossless_inter_tx_type_cdf[CDF_SIZE(2)] = { AOM_CDF2(16384),  75 };
+static const aom_cdf_prob default_lossless_inter_tx_type_cdf[CDF_SIZE(2)] = { AOM_CDF2(16384),   0 };
 
 static const aom_cdf_prob default_skip_txfm_cdfs[6][CDF_SIZE(2)] = {
-  { AOM_CDF2(23601),   0 },
-  { AOM_CDF2(12657),  75 },
-  { AOM_CDF2( 3777),  90 },
-  { AOM_CDF2(23222),   1 },
-  { AOM_CDF2( 8799),  76 },
-  { AOM_CDF2( 1437),  90 },
+  { AOM_CDF2(25865),  25 },
+  { AOM_CDF2(14316),   0 },
+  { AOM_CDF2( 4598),   0 },
+  { AOM_CDF2(25612),   6 },
+  { AOM_CDF2(12366),   1 },
+  { AOM_CDF2( 3320),  90 },
 };
 
-static const aom_cdf_prob default_bru_mode_cdf[CDF_SIZE(3)] = { AOM_CDF3( 4124, 16615),   0 };
+static const aom_cdf_prob default_bru_mode_cdf[CDF_SIZE(3)] = { AOM_CDF3(10923, 21845),   0 };
 
 static const aom_cdf_prob default_intra_inter_cdf[4][CDF_SIZE(2)] = {
-  { AOM_CDF2( 2375),  75 },
-  { AOM_CDF2(16902),  75 },
-  { AOM_CDF2(16384),   0 },
-  { AOM_CDF2(29584),   0 },
+  { AOM_CDF2( 1522),   1 },
+  { AOM_CDF2(14381),   0 },
+  { AOM_CDF2(10455),  25 },
+  { AOM_CDF2(27796),   0 },
 };
 
 static const aom_cdf_prob default_intrabc_cdf[3][CDF_SIZE(2)] = {
-  { AOM_CDF2(30958),   1 },
-  { AOM_CDF2(19490),   0 },
-  { AOM_CDF2( 8708),  90 },
+  { AOM_CDF2(32085),   5 },
+  { AOM_CDF2(15172),  30 },
+  { AOM_CDF2( 4503),   0 },
 };
 
-static const aom_cdf_prob default_intrabc_mode_cdf[CDF_SIZE(2)] = { AOM_CDF2(26560),  31 };
+static const aom_cdf_prob default_intrabc_mode_cdf[CDF_SIZE(2)] = { AOM_CDF2(29993),   6 };
 
 static const aom_cdf_prob default_intrabc_bv_precision_cdf[1][CDF_SIZE(2)] = {
-  { AOM_CDF2(24576),   0 },
+  { AOM_CDF2(19778),  31 },
 };
 
 static const aom_cdf_prob default_switchable_flex_restore_cdf[3][3][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2(21337),  37 },
-    { AOM_CDF2(13763),  32 },
-    { AOM_CDF2(13677),  37 },
+    { AOM_CDF2(25542),  62 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
   },
   {
-    { AOM_CDF2(20429),  37 },
-    { AOM_CDF2(22496),  37 },
-    { AOM_CDF2(18867),  37 },
+    { AOM_CDF2(25550),  37 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
   },
   {
-    { AOM_CDF2(19205),  37 },
+    { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
   },
 };
 
-static const aom_cdf_prob default_wienerns_restore_cdf[CDF_SIZE(2)] = { AOM_CDF2( 6995),  37 };
+static const aom_cdf_prob default_wienerns_restore_cdf[CDF_SIZE(2)] = { AOM_CDF2( 9051),  32 };
 
 static const aom_cdf_prob default_wienerns_length_cdf[2][CDF_SIZE(2)] = {
-  { AOM_CDF2(16384),  61 },
-  { AOM_CDF2(16384),  31 },
+  { AOM_CDF2( 4898),  56 },
+  { AOM_CDF2( 6088),  26 },
 };
 
-static const aom_cdf_prob default_wienerns_uv_sym_cdf[CDF_SIZE(2)] = { AOM_CDF2(16384),  57 };
+static const aom_cdf_prob default_wienerns_uv_sym_cdf[CDF_SIZE(2)] = { AOM_CDF2(29286),  65 };
 
 static const aom_cdf_prob default_wienerns_4part_cdf[1][CDF_SIZE(4)] = {
-  { AOM_CDF4(16384, 24576, 28672),   7 },
+  { AOM_CDF4(16557, 24352, 29677),   6 },
 };
 
-static const aom_cdf_prob default_pc_wiener_restore_cdf[CDF_SIZE(2)] = { AOM_CDF2(14330),   8 };
+static const aom_cdf_prob default_pc_wiener_restore_cdf[CDF_SIZE(2)] = { AOM_CDF2(12799),  25 };
 
 static const aom_cdf_prob default_ccso_cdf[3][4][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2(24690),  37 },
-    { AOM_CDF2(17161),  37 },
-    { AOM_CDF2(10618),  37 },
-    { AOM_CDF2( 7830),  37 },
+    { AOM_CDF2(18469),  62 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2( 4949),  37 },
+    { AOM_CDF2(16384),   0 },
   },
   {
-    { AOM_CDF2(26090),  37 },
-    { AOM_CDF2(18122),  37 },
-    { AOM_CDF2(12248),  37 },
-    { AOM_CDF2( 8523),  37 },
+    { AOM_CDF2(23470),  37 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2( 6666),  37 },
+    { AOM_CDF2(16384),   0 },
   },
   {
-    { AOM_CDF2(27240),  37 },
-    { AOM_CDF2(18679),  37 },
-    { AOM_CDF2(10831),  37 },
-    { AOM_CDF2( 7846),  37 },
+    { AOM_CDF2(22914),  37 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2( 6993),  37 },
+    { AOM_CDF2(16384),   0 },
   },
 };
 
 static const aom_cdf_prob default_cdef_strength_index0_cdf[4][CDF_SIZE(2)] = {
-  { AOM_CDF2(24690),  37 },
-  { AOM_CDF2(17161),  37 },
-  { AOM_CDF2(10618),  37 },
-  { AOM_CDF2( 7830),  37 },
+  { AOM_CDF2(29034),  32 },
+  { AOM_CDF2(16472),  32 },
+  { AOM_CDF2( 5751),  32 },
+  { AOM_CDF2( 3115),  31 },
 };
 
 static const aom_cdf_prob default_cdef_cdf[CDEF_STRENGTHS_NUM - 1][CDF_SIZE(CDEF_STRENGTHS_NUM)] = {
-{ AOM_CDF2(16384),   0 },
-{ AOM_CDF3(10923, 21845),   0 },
-{ AOM_CDF4( 8192, 16384, 24576),   0 },
-{ AOM_CDF5( 6554, 13107, 19661, 26214),   0 },
-{ AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
-{ AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+{ AOM_CDF2(17708),  32 },
+{ AOM_CDF3(13413, 24899),  32 },
+{ AOM_CDF4(10588, 19866, 26664),  37 },
+{ AOM_CDF5(10131, 17874, 23876, 28766),  37 },
+{ AOM_CDF6( 8363, 15451, 20811, 25453, 29393),  32 },
+{ AOM_CDF7( 7372, 13867, 18969, 23278, 26977, 30156),  32 },
 };
 
-static const aom_cdf_prob default_gdf_cdf[CDF_SIZE(2)] = { AOM_CDF2(11570),   0 };
+static const aom_cdf_prob default_gdf_cdf[CDF_SIZE(2)] = { AOM_CDF2(14593),  32 };
 
 static const aom_cdf_prob default_mrl_index_cdf[3][CDF_SIZE(4)] = {
-  { AOM_CDF4(28081, 30613, 31659),  78 },
-  { AOM_CDF4(22175, 28045, 30623),  75 },
-  { AOM_CDF4(17175, 25921, 29682),   1 },
+  { AOM_CDF4(29573, 31193, 32023),  78 },
+  { AOM_CDF4(21812, 27066, 30279),  75 },
+  { AOM_CDF4(16076, 23806, 28762),   1 },
 };
 
 static const aom_cdf_prob default_multi_line_mrl_cdf[3][CDF_SIZE(2)] = {
-  { AOM_CDF2(28081),   0 },
-  { AOM_CDF2(22175),   0 },
-  { AOM_CDF2(16384),   0 },
+  { AOM_CDF2(19678),   6 },
+  { AOM_CDF2(12287),   6 },
+  { AOM_CDF2( 9574),   6 },
 };
 
 static const aom_cdf_prob default_dpcm_cdf[CDF_SIZE(2)] = { AOM_CDF2(16384),   0 };
@@ -685,82 +685,82 @@
 
 static const aom_cdf_prob default_fsc_mode_cdf[4][6][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2(29820),  78 },
-    { AOM_CDF2(31107),  78 },
-    { AOM_CDF2(32018), 118 },
-    { AOM_CDF2(32202), 118 },
-    { AOM_CDF2(32482), 118 },
-    { AOM_CDF2(32539), 123 },
+    { AOM_CDF2(30503),   3 },
+    { AOM_CDF2(31244),   3 },
+    { AOM_CDF2(32254),  78 },
+    { AOM_CDF2(32324),  93 },
+    { AOM_CDF2(32582),  93 },
+    { AOM_CDF2(32691),  93 },
   },
   {
-    { AOM_CDF2(27906),  75 },
-    { AOM_CDF2(27439),  90 },
-    { AOM_CDF2(29059),   1 },
-    { AOM_CDF2(28167),  76 },
-    { AOM_CDF2(27696),   7 },
-    { AOM_CDF2(22842),  54 },
+    { AOM_CDF2(27437),   0 },
+    { AOM_CDF2(27242),  90 },
+    { AOM_CDF2(28040),  76 },
+    { AOM_CDF2(27589),  76 },
+    { AOM_CDF2(27234),   7 },
+    { AOM_CDF2(23583),  62 },
   },
   {
-    { AOM_CDF2(26882), 115 },
-    { AOM_CDF2(22539),  95 },
-    { AOM_CDF2(23495),   8 },
-    { AOM_CDF2(18016),   7 },
-    { AOM_CDF2(11559),  49 },
-    { AOM_CDF2( 4688),   4 },
+    { AOM_CDF2(26068),  75 },
+    { AOM_CDF2(22635),  75 },
+    { AOM_CDF2(22069),   6 },
+    { AOM_CDF2(19218),  32 },
+    { AOM_CDF2(13701),  31 },
+    { AOM_CDF2( 4636),  38 },
   },
   {
-    { AOM_CDF2(29627), 118 },
-    { AOM_CDF2(29794),  93 },
-    { AOM_CDF2(32190), 123 },
-    { AOM_CDF2(32289), 123 },
-    { AOM_CDF2(32618), 123 },
-    { AOM_CDF2(32583), 123 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(32016),  15 },
+    { AOM_CDF2(32403),  93 },
+    { AOM_CDF2(32583),  15 },
+    { AOM_CDF2(32683),  76 },
   },
 };
 
-static const aom_cdf_prob default_cfl_index_cdf[CDF_SIZE(2)] = { AOM_CDF2(18000),   0 };
+static const aom_cdf_prob default_cfl_index_cdf[CDF_SIZE(2)] = { AOM_CDF2(12507),  30 };
 
-static const aom_cdf_prob default_cfl_mhccp_switch_cdf[CDF_SIZE(2)] = { AOM_CDF2(18000),   0 };
+static const aom_cdf_prob default_cfl_mhccp_switch_cdf[CDF_SIZE(2)] = { AOM_CDF2(15499),  30 };
 
-static const aom_cdf_prob default_cfl_sign_cdf[CDF_SIZE(8)] = { AOM_CDF8( 5534,  6742, 11998, 19905, 28459, 29805, 32596),  37 };
+static const aom_cdf_prob default_cfl_sign_cdf[CDF_SIZE(8)] = { AOM_CDF8( 2421,  4332, 11256, 12766, 21386, 28725, 32087),  62 };
 
 static const aom_cdf_prob default_cfl_alpha_cdf[6][CDF_SIZE(8)] = {
-  { AOM_CDF8(10366, 17785, 28218, 30893, 32471, 32638, 32666),  62 },
-  { AOM_CDF8( 4247, 18221, 24527, 31454, 32425, 32695, 32714),  37 },
-  { AOM_CDF8(11483, 20769, 27162, 28811, 32007, 32287, 32375),  62 },
-  { AOM_CDF8(27996, 31615, 32179, 32454, 32541, 32587, 32607),  62 },
-  { AOM_CDF8(18158, 24791, 28870, 29367, 31384, 31714, 32004),  37 },
-  { AOM_CDF8(18147, 27954, 31623, 31810, 31958, 32276, 32341),  62 },
+  { AOM_CDF8(21679, 25305, 30646, 31512, 32537, 32646, 32696),  62 },
+  { AOM_CDF8( 8262, 16302, 24082, 29422, 31398, 32286, 32525),  62 },
+  { AOM_CDF8(17235, 26166, 30378, 31305, 32373, 32549, 32668),  62 },
+  { AOM_CDF8(17618, 25732, 27865, 30338, 31125, 31522, 32238),  62 },
+  { AOM_CDF8(17542, 23066, 27907, 28728, 30702, 31165, 31435),  62 },
+  { AOM_CDF8(17675, 24802, 30468, 30783, 31841, 32264, 32422),  62 },
 };
 
-static const aom_cdf_prob default_y_mode_set_cdf[CDF_SIZE(4)] = { AOM_CDF4(28618, 30909, 31555), 118 };
+static const aom_cdf_prob default_y_mode_set_cdf[CDF_SIZE(4)] = { AOM_CDF4(28863, 31022, 31724),  93 };
 
 static const aom_cdf_prob default_y_mode_idx_cdf[3][CDF_SIZE(8)] = {
-  { AOM_CDF8(14967, 20223, 22467, 24775, 26294, 27253, 28348),  75 },
-  { AOM_CDF8(10399, 14457, 16589, 18447, 19804, 24728, 26455),  75 },
-  { AOM_CDF8( 5342,  7123,  8352,  9283,  9845, 17570, 23158),  75 },
+  { AOM_CDF8(15175, 20075, 21728, 24098, 26405, 27655, 28860),   5 },
+  { AOM_CDF8(10114, 14957, 16815, 19127, 20147, 25583, 27169),   0 },
+  { AOM_CDF8( 5636,  9004, 10456, 12122, 12744, 20325, 25607),   0 },
 };
 
 static const aom_cdf_prob default_y_mode_idx_offset_cdf[3][CDF_SIZE(6)] = {
-  { AOM_CDF6(15256, 19609, 22218, 25531, 27739),  75 },
-  { AOM_CDF6(11526, 16924, 21400, 25152, 28399),  75 },
-  { AOM_CDF6(11465, 16384, 21089, 26781, 29709),  75 },
+  { AOM_CDF6(12743, 18172, 20194, 23648, 26419),   6 },
+  { AOM_CDF6( 8976, 16084, 20827, 24595, 28496),  75 },
+  { AOM_CDF6( 8784, 14556, 19710, 24903, 28724),  75 },
 };
 
 static const aom_cdf_prob default_uv_mode_cdf[2][CDF_SIZE(8)] = {
-  { AOM_CDF8(13848, 18930, 20641, 22133, 23986, 25450, 28075),   0 },
-  { AOM_CDF8(19268, 22648, 25651, 26449, 27288, 28840, 29451),   0 },
+  { AOM_CDF8( 9363, 20957, 22865, 24753, 26411, 27983, 30428),  31 },
+  { AOM_CDF8(21282, 23610, 28208, 29311, 30348, 31158, 31491),  30 },
 };
 
 static const aom_cdf_prob default_switchable_interp_cdf[16][CDF_SIZE(3)] = {
-  { AOM_CDF3(31476, 32736),   0 },
-  { AOM_CDF3( 1637, 32702),  75 },
-  { AOM_CDF3(   11,   709),  90 },
-  { AOM_CDF3(27634, 32442),   6 },
-  { AOM_CDF3(30451, 30981),   0 },
-  { AOM_CDF3( 8963, 32500),   6 },
-  { AOM_CDF3(  370,   693),  75 },
-  { AOM_CDF3(25697, 27654),  31 },
+  { AOM_CDF3(29975, 32748),  25 },
+  { AOM_CDF3( 2076, 32703),  75 },
+  { AOM_CDF3(   19,  1768),  15 },
+  { AOM_CDF3(17314, 27415),  31 },
+  { AOM_CDF3(31286, 31994),   0 },
+  { AOM_CDF3( 9581, 32608),  31 },
+  { AOM_CDF3(  535,  1036),   0 },
+  { AOM_CDF3(24819, 27722),  31 },
   { AOM_CDF3(10923, 21845),   0 },
   { AOM_CDF3(10923, 21845),   0 },
   { AOM_CDF3(10923, 21845),   0 },
@@ -771,13 +771,13 @@
   { AOM_CDF3(10923, 21845),   0 },
 };
 
-static const aom_cdf_prob default_delta_q_cdf[CDF_SIZE(8)] = { AOM_CDF8(16594, 23325, 26424, 28225, 29358, 30099, 30613),  56 };
+static const aom_cdf_prob default_delta_q_cdf[CDF_SIZE(8)] = { AOM_CDF8( 4096,  8192, 12288, 16384, 20480, 24576, 28672),   0 };
 
 static const aom_cdf_prob default_delta_lf_multi_cdf[4][CDF_SIZE(4)] = {
-  { AOM_CDF4(28160, 32120, 32677),   0 },
-  { AOM_CDF4(28160, 32120, 32677),   0 },
-  { AOM_CDF4(28160, 32120, 32677),   0 },
-  { AOM_CDF4(28160, 32120, 32677),   0 },
+  { AOM_CDF4( 8192, 16384, 24576),   0 },
+  { AOM_CDF4( 8192, 16384, 24576),   0 },
+  { AOM_CDF4( 8192, 16384, 24576),   0 },
+  { AOM_CDF4( 8192, 16384, 24576),   0 },
 };
 
 static const aom_cdf_prob default_delta_lf_cdf[CDF_SIZE(4)] = { AOM_CDF4( 8192, 16384, 24576),   0 };
@@ -790,9 +790,9 @@
     { 0 },
   },
 {
-  { AOM_CDF7( 3910, 13624, 16648, 19644, 23773, 27952),  35 },
-  { AOM_CDF7(11788, 21074, 24067, 27345, 29126, 30842),  40 },
-  { AOM_CDF7(11068, 21436, 24806, 28312, 29521, 31139),  60 },
+  { AOM_CDF7( 5026, 16816, 19974, 23404, 26845, 30499),   8 },
+  { AOM_CDF7(14910, 25257, 26964, 29323, 30237, 31535),   0 },
+  { AOM_CDF7(13759, 26108, 27688, 29793, 30265, 31576),  35 },
   { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
 },
   {
@@ -804,29 +804,29 @@
 };
 
 static const aom_cdf_prob default_intra_ext_tx_short_side_cdf[4][CDF_SIZE(4)] = {
-  { AOM_CDF4(11656, 26664, 29603),   0 },
-  { AOM_CDF4(22336, 31457, 32748),   0 },
-  { AOM_CDF4(24537, 32017, 32748),   0 },
+  { AOM_CDF4(10692, 26586, 29231),  31 },
+  { AOM_CDF4(26700, 32160, 32748),   6 },
+  { AOM_CDF4(26915, 32411, 32748),   6 },
   { AOM_CDF4( 8192, 16384, 24576),   0 },
 };
 
 static const aom_cdf_prob default_inter_tx_type_set_cdf[2][3][4][CDF_SIZE(2)] = {
   {
     {
-      { AOM_CDF2(20576),   0 },
-      { AOM_CDF2(16541),   0 },
+      { AOM_CDF2(14122),  25 },
+      { AOM_CDF2( 8962),  31 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
     },
     {
-      { AOM_CDF2(16147),   0 },
-      { AOM_CDF2(30302),   0 },
+      { AOM_CDF2(16423),  26 },
+      { AOM_CDF2(23446),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
     },
     {
-      { AOM_CDF2(25522),   0 },
-      { AOM_CDF2(23776),   0 },
+      { AOM_CDF2(23352),  25 },
+      { AOM_CDF2(17069),  56 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
     },
@@ -835,19 +835,19 @@
     {
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(22866),   0 },
+      { AOM_CDF2(20835),   0 },
       { AOM_CDF2(16384),   0 },
     },
     {
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(32277),   0 },
+      { AOM_CDF2(30720),   3 },
       { AOM_CDF2(16384),   0 },
     },
     {
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(29701),   0 },
+      { AOM_CDF2(28857),  17 },
       { AOM_CDF2(16384),   0 },
     },
   },
@@ -855,27 +855,27 @@
 
 static const aom_cdf_prob default_inter_tx_type_idx_cdf[2][3][CDF_SIZE(8)] = {
   {
-    { AOM_CDF8(14380, 16658, 18988, 22077, 25194, 27959, 30950),   0 },
-    { AOM_CDF8(  442,   561,   737,  1131,  1214,  1494,  1624),   0 },
-    { AOM_CDF8(18414, 19897, 21481, 23996, 27098, 29474, 32457),   0 },
+    { AOM_CDF8( 8914, 10732, 12270, 14822, 17128, 19586, 21964),  25 },
+    { AOM_CDF8( 1160,  1555,  1972,  3414,  3962,  5151,  5908),  31 },
+    { AOM_CDF8(22819, 24338, 25592, 27001, 28395, 29648, 30990),  25 },
   },
   {
-    { AOM_CDF8( 3612,  5799,  8468, 16149, 20607, 25655, 29211),   0 },
-    { AOM_CDF8(  135,   279,   923, 31785, 32279, 32421, 32564),   0 },
-    { AOM_CDF8(26230, 26927, 28614, 29682, 30095, 30901, 31759),   0 },
+    { AOM_CDF8( 1140,  1725,  2324, 14653, 19072, 23618, 28109),  31 },
+    { AOM_CDF8(   58,   261,   587, 32317, 32556, 32626, 32708),   2 },
+    { AOM_CDF8(17404, 17669, 18403, 24052, 26393, 28506, 30676),  57 },
   },
 };
 
 static const aom_cdf_prob default_inter_tx_type_offset_1_cdf[3][CDF_SIZE(8)] = {
-  { AOM_CDF8( 2787,  6375,  8620, 11630, 17688, 22228, 27481),   0 },
-  { AOM_CDF8(  401,   499,   693,   829,  2141,  2356,  2791),   0 },
-  { AOM_CDF8( 1984,  5908,  7465, 10371, 17345, 21585, 26968),   0 },
+  { AOM_CDF8( 3121,  6470,  9191, 12280, 17811, 22588, 27697),  93 },
+  { AOM_CDF8(  338,   377,   571,   743,  7932, 11860, 17524),   1 },
+  { AOM_CDF8( 3314,  7625, 10639, 14206, 19363, 23456, 28033),  93 },
 };
 
 static const aom_cdf_prob default_inter_tx_type_offset_2_cdf[3][CDF_SIZE(4)] = {
-  { AOM_CDF4(10244, 16768, 25390),   0 },
-  { AOM_CDF4(10230, 16432, 24377),   0 },
-  { AOM_CDF4( 8301, 19386, 25851),   0 },
+  { AOM_CDF4( 8669, 16533, 24855),  93 },
+  { AOM_CDF4( 9441, 16413, 25276),  90 },
+  { AOM_CDF4( 8767, 17611, 24876),  10 },
 };
 
 
@@ -902,20 +902,20 @@
     },
       {
   {
-    { AOM_CDF16( 9037, 10470, 11932, 13873, 15828, 17558, 19436, 20576, 21620, 22970, 23724, 24861, 27101, 28740, 30607),  75 },
-    { AOM_CDF16( 4837,  5975,  7101,  8771, 10184, 11652, 13003, 16541, 18453, 20761, 22240, 24190, 26752, 28498, 30554),  75 },
+    { AOM_CDF16( 2048,  4096,  6144,  8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, 24576, 26624, 28672, 30720),   0 },
+    { AOM_CDF16( 2048,  4096,  6144,  8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, 24576, 26624, 28672, 30720),   0 },
     { AOM_CDF16( 2048,  4096,  6144,  8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, 24576, 26624, 28672, 30720),   0 },
     { AOM_CDF16( 2048,  4096,  6144,  8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, 24576, 26624, 28672, 30720),   0 },
   },
   {
-    { AOM_CDF16( 2911,  3858,  4826,  5546,  5683,  6221,  6591, 16147, 16206, 16256, 16318, 16534, 21589, 24753, 28642),   6 },
-    { AOM_CDF16(  409,   519,   682,  1046,  1123,  1381,  1501, 30302, 30605, 30678, 30823, 30928, 31926, 32088, 32409),   1 },
+    { AOM_CDF16( 2048,  4096,  6144,  8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, 24576, 26624, 28672, 30720),   0 },
+    { AOM_CDF16( 2048,  4096,  6144,  8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, 24576, 26624, 28672, 30720),   0 },
     { AOM_CDF16( 2048,  4096,  6144,  8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, 24576, 26624, 28672, 30720),   0 },
     { AOM_CDF16( 2048,  4096,  6144,  8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, 24576, 26624, 28672, 30720),   0 },
   },
   {
-    { AOM_CDF16(14339, 15492, 16743, 18715, 21104, 22943, 25268, 25522, 25961, 26821, 27184, 27829, 29338, 30204, 31281),  78 },
-    { AOM_CDF16(14549, 15847, 17117, 18394, 19905, 21029, 22382, 23776, 24880, 26193, 27197, 28407, 29553, 30713, 31757),  75 },
+    { AOM_CDF16( 2048,  4096,  6144,  8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, 24576, 26624, 28672, 30720),   0 },
+    { AOM_CDF16( 2048,  4096,  6144,  8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, 24576, 26624, 28672, 30720),   0 },
     { AOM_CDF16( 2048,  4096,  6144,  8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, 24576, 26624, 28672, 30720),   0 },
     { AOM_CDF16( 2048,  4096,  6144,  8192, 10240, 12288, 14336, 16384, 18432, 20480, 22528, 24576, 26624, 28672, 30720),   0 },
   },
@@ -924,40 +924,40 @@
   {
     { AOM_CDF12( 2731,  5461,  8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037),   0 },
     { AOM_CDF12( 2731,  5461,  8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037),   0 },
-    { AOM_CDF12( 2522,  4047,  5909, 11268, 14390, 17900, 20374, 22866, 25954, 27992, 30446),  75 },
+    { AOM_CDF12( 2731,  5461,  8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037),   0 },
     { AOM_CDF12( 2731,  5461,  8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037),   0 },
   },
   {
     { AOM_CDF12( 2731,  5461,  8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037),   0 },
     { AOM_CDF12( 2731,  5461,  8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037),   0 },
-    { AOM_CDF12(  133,   275,   909, 31300, 31753, 31888, 32028, 32277, 32529, 32562, 32617),  32 },
+    { AOM_CDF12( 2731,  5461,  8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037),   0 },
     { AOM_CDF12( 2731,  5461,  8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037),   0 },
   },
   {
     { AOM_CDF12( 2731,  5461,  8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037),   0 },
     { AOM_CDF12( 2731,  5461,  8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037),   0 },
-    { AOM_CDF12(23775, 24397, 25942, 26888, 27257, 27972, 28802, 29701, 30485, 31477, 32168),  56 },
+    { AOM_CDF12( 2731,  5461,  8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037),   0 },
     { AOM_CDF12( 2731,  5461,  8192, 10923, 13653, 16384, 19115, 21845, 24576, 27307, 30037),   0 },
   },
 },
 {
   {
-    { AOM_CDF2( 5900),  32 },
-    { AOM_CDF2(  984),  32 },
-    { AOM_CDF2( 1539),  37 },
-    { AOM_CDF2( 2809),  36 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
   },
   {
-    { AOM_CDF2(  751),  77 },
-    { AOM_CDF2(   19), 102 },
-    { AOM_CDF2(   27), 120 },
-    { AOM_CDF2(   20), 104 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
   },
   {
-    { AOM_CDF2(23032),  60 },
-    { AOM_CDF2(25224),  50 },
-    { AOM_CDF2(30401),  50 },
-    { AOM_CDF2(31447),  50 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
   },
 },
 {
@@ -984,152 +984,152 @@
 
 static const aom_cdf_prob default_inter_ext_tx_short_side_cdf[3][4][CDF_SIZE(4)] = {
   {
-    { AOM_CDF4( 7821, 18687, 24236),   0 },
-    { AOM_CDF4(14442, 26756, 32748),   0 },
-    { AOM_CDF4(16946, 27485, 32748),   0 },
+    { AOM_CDF4( 8347, 20254, 24536),  31 },
+    { AOM_CDF4(15994, 26294, 32748),   1 },
+    { AOM_CDF4(21212, 27810, 32748),   1 },
     { AOM_CDF4( 8192, 16384, 24576),   0 },
   },
   {
-    { AOM_CDF4(20461, 26250, 29309),   0 },
-    { AOM_CDF4(24931, 30589, 32748),   0 },
-    { AOM_CDF4(28078, 31430, 32748),   0 },
+    { AOM_CDF4(21815, 25084, 26230),  62 },
+    { AOM_CDF4(29354, 31747, 32748),  37 },
+    { AOM_CDF4(31614, 32529, 32748),  36 },
     { AOM_CDF4( 8192, 16384, 24576),   0 },
   },
   {
-    { AOM_CDF4( 7593, 15185, 16784),   0 },
-    { AOM_CDF4(17164, 21845, 31208),   0 },
-    { AOM_CDF4( 9362, 23406, 28087),   0 },
+    { AOM_CDF4(10501, 20590, 24181),  31 },
+    { AOM_CDF4(17596, 26388, 32748),  37 },
+    { AOM_CDF4(15407, 26475, 32732),  60 },
     { AOM_CDF4( 8192, 16384, 24576),   0 },
   },
 };
 
 static const aom_cdf_prob default_tx_ext_32_cdf[2][CDF_SIZE(2)] = {
-  { AOM_CDF2(   67),   0 },
-  { AOM_CDF2(  129),   0 },
+  { AOM_CDF2(   36),   0 },
+  { AOM_CDF2(  128),  31 },
 };
 
 static const aom_cdf_prob default_stx_cdf[2][5][CDF_SIZE(4)] = {
   {
-    { AOM_CDF4(  293, 11683, 25053),  75 },
-    { AOM_CDF4( 2952,  9945, 16750),   0 },
-    { AOM_CDF4( 2684,  9484, 16065),  75 },
-    { AOM_CDF4( 3552, 10398, 15130),  75 },
-    { AOM_CDF4(10685, 14127, 17177),   1 },
+    { AOM_CDF4( 4486, 15589, 26440),  75 },
+    { AOM_CDF4( 2357,  9504, 16641),   5 },
+    { AOM_CDF4( 1364,  8034, 14431),   0 },
+    { AOM_CDF4( 2472,  8725, 13853),  76 },
+    { AOM_CDF4( 7523, 11681, 14783),   1 },
   },
   {
-    { AOM_CDF4(  293, 11683, 25053),   0 },
-    { AOM_CDF4( 2952,  9945, 16750),   0 },
-    { AOM_CDF4( 2684,  9484, 16065),   6 },
-    { AOM_CDF4( 3552, 10398, 15130),   6 },
-    { AOM_CDF4(10685, 14127, 17177),  31 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4( 8192, 16384, 24576),   0 },
+    { AOM_CDF4(10490, 15394, 22206),  31 },
+    { AOM_CDF4(13967, 16953, 23109),  31 },
+    { AOM_CDF4(20191, 21727, 25818),  32 },
   },
 };
 
-static const aom_cdf_prob default_cctx_type_cdf[CDF_SIZE(7)] = { AOM_CDF7(13038, 14157, 16570, 18922, 21570, 29304),  37 };
+static const aom_cdf_prob default_cctx_type_cdf[CDF_SIZE(7)] = { AOM_CDF7(14350, 14836, 16054, 17075, 19408, 28530),  62 };
 
 static const aom_cdf_prob default_pb_mv_most_probable_precision_cdf[3][CDF_SIZE(2)] = {
-  { AOM_CDF2(27840),   0 },
-  { AOM_CDF2(23276),   1 },
-  { AOM_CDF2(14105),   0 },
+  { AOM_CDF2(20650),  31 },
+  { AOM_CDF2(15758),  31 },
+  { AOM_CDF2( 4571),  31 },
 };
 
 static const aom_cdf_prob default_pb_mv_precision_cdf[2][3][CDF_SIZE(3)] = {
   {
     { AOM_CDF3(10923, 21845),   0 },
-    { AOM_CDF3(30680, 31861),  78 },
-    { AOM_CDF3(21154, 31023),   0 },
+    { AOM_CDF3(31340, 32505),  78 },
+    { AOM_CDF3(26039, 32175),   0 },
   },
   {
     { AOM_CDF3(10923, 21845),   0 },
-    { AOM_CDF3(31613, 32191),  78 },
-    { AOM_CDF3(25484, 32287),  75 },
+    { AOM_CDF3(32197, 32676),  75 },
+    { AOM_CDF3(28679, 32626),   0 },
   },
 };
 
 static const aom_cdf_prob default_do_split_cdf[2][64][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2(29592),   3 },
-    { AOM_CDF2(25157),   0 },
-    { AOM_CDF2(24896),   3 },
-    { AOM_CDF2(18550),   3 },
-    { AOM_CDF2(26167),   0 },
-    { AOM_CDF2(16439),   0 },
-    { AOM_CDF2(18221),   1 },
-    { AOM_CDF2( 8357),   0 },
-    { AOM_CDF2(23673),   0 },
-    { AOM_CDF2(12166),  26 },
-    { AOM_CDF2(14523),  26 },
-    { AOM_CDF2( 4830),   0 },
-    { AOM_CDF2(21600),  15 },
-    { AOM_CDF2( 7914),  26 },
-    { AOM_CDF2(11061),  26 },
-    { AOM_CDF2( 2383),   0 },
-    { AOM_CDF2(24735),  17 },
-    { AOM_CDF2(10913),  75 },
-    { AOM_CDF2(23823),  20 },
-    { AOM_CDF2(11191),  70 },
-    { AOM_CDF2(28036),  27 },
-    { AOM_CDF2(21661),  27 },
-    { AOM_CDF2(14269),  34 },
-    { AOM_CDF2( 9134),  50 },
-    { AOM_CDF2(19651),   1 },
-    { AOM_CDF2( 6508),  32 },
-    { AOM_CDF2( 7948),  41 },
-    { AOM_CDF2( 1824),  25 },
-    { AOM_CDF2(26166),  99 },
-    { AOM_CDF2(12700),  20 },
-    { AOM_CDF2(20665), 100 },
-    { AOM_CDF2( 8113),  50 },
-    { AOM_CDF2(25468), 122 },
-    { AOM_CDF2(23585), 100 },
-    { AOM_CDF2(16272), 100 },
-    { AOM_CDF2(13812), 100 },
-    { AOM_CDF2(25374),  19 },
-    { AOM_CDF2( 4948),  32 },
-    { AOM_CDF2( 8097),  95 },
-    { AOM_CDF2( 1079),  47 },
-    { AOM_CDF2(28437),  75 },
-    { AOM_CDF2(26588),  75 },
-    { AOM_CDF2(22900),   0 },
-    { AOM_CDF2(18688),   1 },
-    { AOM_CDF2(27263),   0 },
-    { AOM_CDF2(21031),   0 },
-    { AOM_CDF2(26901),   0 },
-    { AOM_CDF2(17084),   0 },
-    { AOM_CDF2(26802),   0 },
-    { AOM_CDF2(17834),   1 },
-    { AOM_CDF2(20733),   1 },
-    { AOM_CDF2(12114),  31 },
-    { AOM_CDF2(22883),   1 },
-    { AOM_CDF2(12440),  31 },
-    { AOM_CDF2(12447),   0 },
-    { AOM_CDF2( 5380),  25 },
-    { AOM_CDF2(25790),   0 },
-    { AOM_CDF2(16300),   9 },
-    { AOM_CDF2(18314),  32 },
-    { AOM_CDF2( 9351),  37 },
-    { AOM_CDF2(22881),  32 },
-    { AOM_CDF2( 8456),  31 },
-    { AOM_CDF2(11142),   9 },
-    { AOM_CDF2( 2431),  25 },
+    { AOM_CDF2(28084),   3 },
+    { AOM_CDF2(23755),  93 },
+    { AOM_CDF2(23634),  93 },
+    { AOM_CDF2(19368),   3 },
+    { AOM_CDF2(24961),   0 },
+    { AOM_CDF2(14941),   1 },
+    { AOM_CDF2(16154),   1 },
+    { AOM_CDF2( 5905),   0 },
+    { AOM_CDF2(21934),   0 },
+    { AOM_CDF2(10440),  26 },
+    { AOM_CDF2(11984),  31 },
+    { AOM_CDF2( 3474),   0 },
+    { AOM_CDF2(20492),  16 },
+    { AOM_CDF2( 6963),   6 },
+    { AOM_CDF2( 8099),  26 },
+    { AOM_CDF2( 1529),   0 },
+    { AOM_CDF2(24117),  92 },
+    { AOM_CDF2( 7871),  10 },
+    { AOM_CDF2(23604),   2 },
+    { AOM_CDF2( 8429),  30 },
+    { AOM_CDF2(27356),   2 },
+    { AOM_CDF2(22441),   7 },
+    { AOM_CDF2( 8897),  31 },
+    { AOM_CDF2( 6811),  61 },
+    { AOM_CDF2(17592),  16 },
+    { AOM_CDF2( 5648),  32 },
+    { AOM_CDF2( 5339),  26 },
+    { AOM_CDF2( 1082),  26 },
+    { AOM_CDF2(26143),  77 },
+    { AOM_CDF2(11379),  85 },
+    { AOM_CDF2(20142),  93 },
+    { AOM_CDF2( 7401),   8 },
+    { AOM_CDF2(26235),  82 },
+    { AOM_CDF2(23674),  78 },
+    { AOM_CDF2(12441),  77 },
+    { AOM_CDF2(10482),  75 },
+    { AOM_CDF2(20663),   0 },
+    { AOM_CDF2( 4192),  27 },
+    { AOM_CDF2( 5274),  33 },
+    { AOM_CDF2(  713),   1 },
+    { AOM_CDF2(28255),  75 },
+    { AOM_CDF2(27370),  75 },
+    { AOM_CDF2(23527),   0 },
+    { AOM_CDF2(20990),   1 },
+    { AOM_CDF2(26727),   0 },
+    { AOM_CDF2(21187),   0 },
+    { AOM_CDF2(25324),   0 },
+    { AOM_CDF2(17838),   0 },
+    { AOM_CDF2(26136),   0 },
+    { AOM_CDF2(16591),   6 },
+    { AOM_CDF2(19838),   1 },
+    { AOM_CDF2(10605),  31 },
+    { AOM_CDF2(22914),   1 },
+    { AOM_CDF2(12609),  31 },
+    { AOM_CDF2(11341),   0 },
+    { AOM_CDF2( 4556),   0 },
+    { AOM_CDF2(24218),   1 },
+    { AOM_CDF2(13059),   7 },
+    { AOM_CDF2(15378),  32 },
+    { AOM_CDF2( 5858),  32 },
+    { AOM_CDF2(21644),  32 },
+    { AOM_CDF2( 7767),  31 },
+    { AOM_CDF2( 8309),   6 },
+    { AOM_CDF2( 1687),   0 },
   },
   {
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
-    { AOM_CDF2(25023),   0 },
-    { AOM_CDF2(20754),   0 },
-    { AOM_CDF2(20240),   0 },
-    { AOM_CDF2(16994),   0 },
-    { AOM_CDF2(23601),   1 },
-    { AOM_CDF2(18512),  31 },
-    { AOM_CDF2(18745),  31 },
-    { AOM_CDF2(13554),  31 },
-    { AOM_CDF2(27392),   6 },
-    { AOM_CDF2(19251),  32 },
-    { AOM_CDF2(22019),  32 },
-    { AOM_CDF2(13900),  31 },
+    { AOM_CDF2(25554),   0 },
+    { AOM_CDF2(18892),   0 },
+    { AOM_CDF2(18530),   0 },
+    { AOM_CDF2(10806),   6 },
+    { AOM_CDF2(22504),   1 },
+    { AOM_CDF2(12140),  31 },
+    { AOM_CDF2(11966),  31 },
+    { AOM_CDF2( 4984),  30 },
+    { AOM_CDF2(24460),  31 },
+    { AOM_CDF2( 8698),  31 },
+    { AOM_CDF2( 9655),  31 },
+    { AOM_CDF2( 2563),  30 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
@@ -1162,35 +1162,35 @@
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
-    { AOM_CDF2(24433),   4 },
-    { AOM_CDF2(23923),  22 },
-    { AOM_CDF2(20977),   1 },
-    { AOM_CDF2(18697),   1 },
-    { AOM_CDF2(22912),   1 },
-    { AOM_CDF2(19497),   1 },
-    { AOM_CDF2(20455),   6 },
-    { AOM_CDF2(16519),   1 },
-    { AOM_CDF2(22789),  47 },
-    { AOM_CDF2(18840),  10 },
-    { AOM_CDF2(20664),   6 },
-    { AOM_CDF2(16212),  34 },
-    { AOM_CDF2(23284),  38 },
-    { AOM_CDF2(15481),  32 },
-    { AOM_CDF2(16501),  35 },
-    { AOM_CDF2( 9912),  31 },
+    { AOM_CDF2(26227),   0 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(17669),   1 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(26179),   1 },
+    { AOM_CDF2(17889),   1 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(16384),   0 },
+    { AOM_CDF2(23500),   1 },
+    { AOM_CDF2(13115),  31 },
+    { AOM_CDF2(15253),  31 },
+    { AOM_CDF2( 6458),  55 },
+    { AOM_CDF2(22566),  31 },
+    { AOM_CDF2(11497),  32 },
+    { AOM_CDF2(10045),  31 },
+    { AOM_CDF2( 3750),  26 },
   },
 };
 
 static const aom_cdf_prob default_do_square_split_cdf[2][8][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2(21371),   7 },
-    { AOM_CDF2(14164),  56 },
-    { AOM_CDF2(15382),  62 },
-    { AOM_CDF2( 7023),  37 },
-    { AOM_CDF2(19803),  75 },
-    { AOM_CDF2(11920),  60 },
-    { AOM_CDF2(14061),  35 },
-    { AOM_CDF2( 6299),  32 },
+    { AOM_CDF2(18000),   7 },
+    { AOM_CDF2(10521),  37 },
+    { AOM_CDF2(11395),  62 },
+    { AOM_CDF2( 4419),  32 },
+    { AOM_CDF2(12996),  85 },
+    { AOM_CDF2( 8185),  55 },
+    { AOM_CDF2(10979),  36 },
+    { AOM_CDF2( 5010),  32 },
   },
   {
     { AOM_CDF2(16384),   0 },
@@ -1206,34 +1206,34 @@
 
 static const aom_cdf_prob default_rect_type_cdf[2][64][CDF_SIZE(2)] = {
   {
-    { AOM_CDF2(14338),   0 },
-    { AOM_CDF2(10228),   0 },
-    { AOM_CDF2(18329),   0 },
-    { AOM_CDF2(15630),  75 },
-    { AOM_CDF2(20106),   0 },
-    { AOM_CDF2(13528),   0 },
-    { AOM_CDF2(25273),   0 },
-    { AOM_CDF2(21875),   1 },
-    { AOM_CDF2(11348),  75 },
-    { AOM_CDF2( 7569),  15 },
-    { AOM_CDF2(20957),   1 },
-    { AOM_CDF2(14158),   1 },
-    { AOM_CDF2(13127),  91 },
-    { AOM_CDF2( 9850),   1 },
-    { AOM_CDF2(17267),   1 },
-    { AOM_CDF2(16081),   6 },
-    { AOM_CDF2(14602),   7 },
-    { AOM_CDF2(11661),   7 },
-    { AOM_CDF2(19594),   1 },
-    { AOM_CDF2(19302),   6 },
-    { AOM_CDF2(14336),   1 },
-    { AOM_CDF2( 8642),   1 },
-    { AOM_CDF2(22984),   7 },
-    { AOM_CDF2(13828),   6 },
-    { AOM_CDF2(17574),   1 },
-    { AOM_CDF2(12716),  31 },
-    { AOM_CDF2(24743),   1 },
-    { AOM_CDF2(22007),   1 },
+    { AOM_CDF2(14644),   0 },
+    { AOM_CDF2(10173),  75 },
+    { AOM_CDF2(18529),   0 },
+    { AOM_CDF2(16071),  90 },
+    { AOM_CDF2(20263),   1 },
+    { AOM_CDF2(12813),   1 },
+    { AOM_CDF2(26612),   0 },
+    { AOM_CDF2(23277),   1 },
+    { AOM_CDF2(10594),  76 },
+    { AOM_CDF2( 7000),  75 },
+    { AOM_CDF2(20002),   1 },
+    { AOM_CDF2(12889),   2 },
+    { AOM_CDF2(13854),  76 },
+    { AOM_CDF2(10750),   1 },
+    { AOM_CDF2(18380),   1 },
+    { AOM_CDF2(17505),   6 },
+    { AOM_CDF2(14430),   7 },
+    { AOM_CDF2(11554),   2 },
+    { AOM_CDF2(20078),   1 },
+    { AOM_CDF2(19097),  76 },
+    { AOM_CDF2(15278),   2 },
+    { AOM_CDF2(10137),   1 },
+    { AOM_CDF2(21921),   7 },
+    { AOM_CDF2(14621),   6 },
+    { AOM_CDF2(19330),   2 },
+    { AOM_CDF2(15921),   1 },
+    { AOM_CDF2(26218),   1 },
+    { AOM_CDF2(24318),   1 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
@@ -1242,10 +1242,10 @@
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
-    { AOM_CDF2(15380),   0 },
-    { AOM_CDF2( 9860),  47 },
-    { AOM_CDF2(19503),  31 },
-    { AOM_CDF2(14132),  39 },
+    { AOM_CDF2(16066),  78 },
+    { AOM_CDF2( 9225),   2 },
+    { AOM_CDF2(22849),  31 },
+    { AOM_CDF2(14817),  11 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
@@ -1254,52 +1254,52 @@
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
-    { AOM_CDF2(16602),   0 },
-    { AOM_CDF2(13446),  10 },
-    { AOM_CDF2(19306),  10 },
-    { AOM_CDF2(17273),  25 },
-    { AOM_CDF2(22921),   1 },
-    { AOM_CDF2(18378),  15 },
-    { AOM_CDF2(28277),   0 },
-    { AOM_CDF2(26248),   0 },
-    { AOM_CDF2( 5795),   1 },
-    { AOM_CDF2( 1483),  90 },
-    { AOM_CDF2(11973),  30 },
-    { AOM_CDF2( 2872),   0 },
+    { AOM_CDF2(18543),  75 },
+    { AOM_CDF2(13210),  10 },
+    { AOM_CDF2(24367),  32 },
+    { AOM_CDF2(18417),  25 },
+    { AOM_CDF2(24701),   6 },
+    { AOM_CDF2(18911),   7 },
+    { AOM_CDF2(29590),   1 },
+    { AOM_CDF2(27778),   7 },
+    { AOM_CDF2( 3400),   1 },
+    { AOM_CDF2(  935),  90 },
+    { AOM_CDF2(10365),  32 },
+    { AOM_CDF2( 1723),   1 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
   },
   {
-    { AOM_CDF2(15399),  76 },
-    { AOM_CDF2(14137),  75 },
-    { AOM_CDF2(17710), 121 },
-    { AOM_CDF2(14838),  90 },
-    { AOM_CDF2(17776),  84 },
-    { AOM_CDF2(14815),  21 },
-    { AOM_CDF2(21224),  75 },
-    { AOM_CDF2(19659),  76 },
-    { AOM_CDF2(14762),   5 },
-    { AOM_CDF2(13021),   0 },
-    { AOM_CDF2(18088),   5 },
-    { AOM_CDF2(15202),   0 },
-    { AOM_CDF2(16855), 100 },
-    { AOM_CDF2(13189),  76 },
-    { AOM_CDF2(19008),   7 },
-    { AOM_CDF2(15846),  75 },
-    { AOM_CDF2(18420),  50 },
-    { AOM_CDF2(12793),  95 },
-    { AOM_CDF2(23424),  22 },
-    { AOM_CDF2(22374),   6 },
-    { AOM_CDF2(12213),  97 },
-    { AOM_CDF2( 8571),  75 },
-    { AOM_CDF2(20413),  12 },
-    { AOM_CDF2(11571),   1 },
-    { AOM_CDF2(15862),  85 },
-    { AOM_CDF2(10112),  24 },
-    { AOM_CDF2(22575),  12 },
-    { AOM_CDF2(17188),   6 },
+    { AOM_CDF2(15654),  76 },
+    { AOM_CDF2(13500),  75 },
+    { AOM_CDF2(19177),  91 },
+    { AOM_CDF2(14739),  90 },
+    { AOM_CDF2(18769),  75 },
+    { AOM_CDF2(13500),   1 },
+    { AOM_CDF2(23583),  75 },
+    { AOM_CDF2(20927),  75 },
+    { AOM_CDF2(15045),   1 },
+    { AOM_CDF2(10528),   0 },
+    { AOM_CDF2(22474),   6 },
+    { AOM_CDF2(14250),   0 },
+    { AOM_CDF2(16561),  75 },
+    { AOM_CDF2(11427),  76 },
+    { AOM_CDF2(21874),   6 },
+    { AOM_CDF2(16344),  90 },
+    { AOM_CDF2(21566),  31 },
+    { AOM_CDF2(13357),   2 },
+    { AOM_CDF2(27355),   1 },
+    { AOM_CDF2(24117),   6 },
+    { AOM_CDF2(10901),  77 },
+    { AOM_CDF2( 5780),   0 },
+    { AOM_CDF2(19056),  37 },
+    { AOM_CDF2( 9141),   1 },
+    { AOM_CDF2(20436),   7 },
+    { AOM_CDF2(15693),  32 },
+    { AOM_CDF2(26536),   6 },
+    { AOM_CDF2(23667),  31 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
@@ -1324,14 +1324,14 @@
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
-    { AOM_CDF2(18577), 100 },
-    { AOM_CDF2(14008), 100 },
-    { AOM_CDF2(22927),  35 },
-    { AOM_CDF2(20558),  95 },
-    { AOM_CDF2(11916),  45 },
-    { AOM_CDF2( 5718),   6 },
-    { AOM_CDF2(15864),  45 },
-    { AOM_CDF2( 6207),  26 },
+    { AOM_CDF2(19241),   7 },
+    { AOM_CDF2(13038),  32 },
+    { AOM_CDF2(28903),  32 },
+    { AOM_CDF2(24802),  32 },
+    { AOM_CDF2( 9097),  32 },
+    { AOM_CDF2( 2749),   6 },
+    { AOM_CDF2(15201),  27 },
+    { AOM_CDF2( 4449),   6 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
@@ -1346,18 +1346,18 @@
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(31443),  78 },
-      { AOM_CDF2(28558),   0 },
-      { AOM_CDF2(28437),   0 },
-      { AOM_CDF2(25094),  15 },
-      { AOM_CDF2(30737),  93 },
-      { AOM_CDF2(27830),  75 },
-      { AOM_CDF2(27423),  75 },
-      { AOM_CDF2(26170),   0 },
-      { AOM_CDF2(30343),  93 },
-      { AOM_CDF2(27986),  15 },
-      { AOM_CDF2(27168),  75 },
-      { AOM_CDF2(26844),  25 },
+      { AOM_CDF2(31091),   3 },
+      { AOM_CDF2(29638),   0 },
+      { AOM_CDF2(28924),   0 },
+      { AOM_CDF2(28653),   0 },
+      { AOM_CDF2(30349),  93 },
+      { AOM_CDF2(28265),  75 },
+      { AOM_CDF2(27287),   0 },
+      { AOM_CDF2(27721),   0 },
+      { AOM_CDF2(29960),  93 },
+      { AOM_CDF2(28345),  90 },
+      { AOM_CDF2(27302),  90 },
+      { AOM_CDF2(27252),  75 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
@@ -1390,22 +1390,22 @@
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(30314),   1 },
-      { AOM_CDF2(26226),   9 },
-      { AOM_CDF2(25222),   9 },
-      { AOM_CDF2(22803),  22 },
-      { AOM_CDF2(30598),  75 },
-      { AOM_CDF2(27892),  75 },
-      { AOM_CDF2(27462),  90 },
-      { AOM_CDF2(25206),  90 },
-      { AOM_CDF2(29897),   1 },
-      { AOM_CDF2(24820),  45 },
-      { AOM_CDF2(24435),   5 },
-      { AOM_CDF2(20217),  17 },
-      { AOM_CDF2(28940),  90 },
-      { AOM_CDF2(25901),  98 },
-      { AOM_CDF2(24666), 118 },
-      { AOM_CDF2(23826),  75 },
+      { AOM_CDF2(30342),   1 },
+      { AOM_CDF2(27563),   6 },
+      { AOM_CDF2(26168),   6 },
+      { AOM_CDF2(23089),  32 },
+      { AOM_CDF2(30643),   0 },
+      { AOM_CDF2(28683),   1 },
+      { AOM_CDF2(28009),   0 },
+      { AOM_CDF2(26186),   0 },
+      { AOM_CDF2(29222),   1 },
+      { AOM_CDF2(25740),   0 },
+      { AOM_CDF2(24079),   6 },
+      { AOM_CDF2(19806),  76 },
+      { AOM_CDF2(29409),  90 },
+      { AOM_CDF2(26825),  93 },
+      { AOM_CDF2(25919),  93 },
+      { AOM_CDF2(24417),  93 },
     },
   },
   {
@@ -1418,14 +1418,14 @@
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),  31 },
-      { AOM_CDF2(16384),  25 },
-      { AOM_CDF2(16384),  31 },
-      { AOM_CDF2(16384),  25 },
-      { AOM_CDF2(16384),  31 },
-      { AOM_CDF2(16384),  31 },
-      { AOM_CDF2(16384),  31 },
-      { AOM_CDF2(16384),  30 },
+      { AOM_CDF2(26866),  30 },
+      { AOM_CDF2(24499),  25 },
+      { AOM_CDF2(24732),  31 },
+      { AOM_CDF2(23387),  25 },
+      { AOM_CDF2(27477),  30 },
+      { AOM_CDF2(25837),  31 },
+      { AOM_CDF2(24621),  31 },
+      { AOM_CDF2(23604),   5 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
@@ -1466,14 +1466,14 @@
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),  25 },
-      { AOM_CDF2(16384), 100 },
-      { AOM_CDF2(16384), 100 },
-      { AOM_CDF2(16384),  10 },
-      { AOM_CDF2(16384),  32 },
-      { AOM_CDF2(16384),  30 },
-      { AOM_CDF2(16384),  34 },
-      { AOM_CDF2(16384),   0 },
+      { AOM_CDF2(24384),  26 },
+      { AOM_CDF2(22113),  32 },
+      { AOM_CDF2(21798),   2 },
+      { AOM_CDF2(20067),   6 },
+      { AOM_CDF2(26220),  31 },
+      { AOM_CDF2(22997),  30 },
+      { AOM_CDF2(22249),  31 },
+      { AOM_CDF2(20091),   0 },
     },
   },
 };
@@ -1489,14 +1489,14 @@
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(22788),  75 },
-      { AOM_CDF2(20501),   1 },
-      { AOM_CDF2(20361),   1 },
-      { AOM_CDF2(18603),   5 },
-      { AOM_CDF2(21947),  19 },
-      { AOM_CDF2(20816),   9 },
-      { AOM_CDF2(19610),   9 },
-      { AOM_CDF2(20458),  32 },
+      { AOM_CDF2(25789),  31 },
+      { AOM_CDF2(25290),  32 },
+      { AOM_CDF2(24270),  31 },
+      { AOM_CDF2(22994),  31 },
+      { AOM_CDF2(25801),   1 },
+      { AOM_CDF2(25260),   7 },
+      { AOM_CDF2(24041),   1 },
+      { AOM_CDF2(24281),   1 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
@@ -1529,22 +1529,22 @@
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(18501),  24 },
-      { AOM_CDF2(15193),   0 },
-      { AOM_CDF2(15645),  90 },
-      { AOM_CDF2(13389),  80 },
-      { AOM_CDF2(14267),   6 },
-      { AOM_CDF2(12424),  99 },
-      { AOM_CDF2(12381),  91 },
-      { AOM_CDF2(10715),  78 },
-      { AOM_CDF2(15353),   0 },
-      { AOM_CDF2(13584),   0 },
-      { AOM_CDF2(13401),  75 },
-      { AOM_CDF2(11604),  95 },
-      { AOM_CDF2(10973),  10 },
-      { AOM_CDF2( 9351),  80 },
-      { AOM_CDF2( 9200),  84 },
-      { AOM_CDF2( 7561),  75 },
+      { AOM_CDF2(23038),   6 },
+      { AOM_CDF2(19972),  40 },
+      { AOM_CDF2(19723),   8 },
+      { AOM_CDF2(17939),   0 },
+      { AOM_CDF2(15574),   6 },
+      { AOM_CDF2(13761),  76 },
+      { AOM_CDF2(12917),  91 },
+      { AOM_CDF2(11328),  75 },
+      { AOM_CDF2(17295),  32 },
+      { AOM_CDF2(14463),  38 },
+      { AOM_CDF2(14724),   6 },
+      { AOM_CDF2(11653),   1 },
+      { AOM_CDF2(13202),  32 },
+      { AOM_CDF2(10929),   7 },
+      { AOM_CDF2(10348),   7 },
+      { AOM_CDF2( 8276),   1 },
     },
   },
   {
@@ -1561,10 +1561,10 @@
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),  22 },
-      { AOM_CDF2(16384),  75 },
-      { AOM_CDF2(16384),  80 },
-      { AOM_CDF2(16384),  76 },
+      { AOM_CDF2(24728),  31 },
+      { AOM_CDF2(22673),  31 },
+      { AOM_CDF2(21033),   6 },
+      { AOM_CDF2(20321),   1 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
@@ -1605,14 +1605,14 @@
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),  25 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(16384), 100 },
-      { AOM_CDF2(16384), 100 },
-      { AOM_CDF2(16384),  10 },
-      { AOM_CDF2(16384),  20 },
-      { AOM_CDF2(16384),   6 },
+      { AOM_CDF2(24631),  67 },
+      { AOM_CDF2(21363),  15 },
+      { AOM_CDF2(20201),  15 },
+      { AOM_CDF2(17529),  82 },
+      { AOM_CDF2(21042),   3 },
+      { AOM_CDF2(18640),  80 },
+      { AOM_CDF2(18183),  91 },
+      { AOM_CDF2(15590),  76 },
     },
   },
 };
@@ -1620,70 +1620,70 @@
 static const aom_cdf_prob default_txfm_4way_partition_type_reduced_cdf[2][2][14][CDF_SIZE(7)] = {
   {
     {
-      { AOM_CDF7(32414, 32473, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 2876, 18313, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 3923,  9350, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 6028, 14813, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 3202, 14728, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 4109,  8558, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 6859, 14500, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 3391, 11845, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 3524, 10297, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 4258, 11816, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 2794, 12996, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 2464,  6875, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 4942, 22210, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 5470, 15586, 32532, 32591, 32650, 32709),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
     },
     {
-      { AOM_CDF7(13540, 21123, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 7415, 15547, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 4894, 11490, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 5041, 10187, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7(14018, 23200, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7(13864, 16376, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 8947, 12382, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7(11792, 18010, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7(14010, 21153, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 8570, 15398, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 5364, 12080, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 3916, 11644, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7(11052, 23760, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7(12450, 19865, 32532, 32591, 32650, 32709),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
     },
   },
   {
     {
-      { AOM_CDF7( 8192, 12288, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 1425, 11398, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 2621, 11796, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 1489, 13405, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 2185, 15292, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 3277, 16384, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 5461, 16384, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 2185,  8738, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 4681, 18725, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
     },
     {
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 9362, 18724, 32532, 32591, 32650, 32709),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+      { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
     },
   },
 };
@@ -1691,18 +1691,18 @@
 static const aom_cdf_prob default_txfm_2or3_way_partition_type_cdf[2][2][2][CDF_SIZE(2)] = {
   {
     {
-      { AOM_CDF2(19001),   0 },
-      { AOM_CDF2(19541),   0 },
+      { AOM_CDF2(25131),  30 },
+      { AOM_CDF2(24514),  30 },
     },
     {
-      { AOM_CDF2(18801),   0 },
-      { AOM_CDF2(18916),   0 },
+      { AOM_CDF2(19534),   6 },
+      { AOM_CDF2(18637),   0 },
     },
   },
   {
     {
-      { AOM_CDF2(23406),   0 },
-      { AOM_CDF2(28399),   0 },
+      { AOM_CDF2(30226),  50 },
+      { AOM_CDF2(30703),  33 },
     },
     {
       { AOM_CDF2(16384),   0 },
@@ -1711,46 +1711,46 @@
   },
 };
 
-static const aom_cdf_prob default_most_probable_stx_set_cdf[CDF_SIZE(7)] = { AOM_CDF7(16328, 21408, 25613, 27672, 29722, 31413),  75 };
+static const aom_cdf_prob default_most_probable_stx_set_cdf[CDF_SIZE(7)] = { AOM_CDF7(20712, 26263, 30623, 32732, 32736, 32740),  55 };
 
-static const aom_cdf_prob default_most_probable_stx_set_cdf_ADST_ADST[CDF_SIZE(4)] = { AOM_CDF4(16328, 21408, 25613),  75 };
+static const aom_cdf_prob default_most_probable_stx_set_cdf_ADST_ADST[CDF_SIZE(4)] = { AOM_CDF4(15897, 26144, 30010),   5 };
 
 static const aom_cdf_prob default_txfm_do_partition_cdf[2][2][9][CDF_SIZE(2)] = {
   {
     {
-      { AOM_CDF2(16673),   0 },
-      { AOM_CDF2(32057),   0 },
-      { AOM_CDF2(21412),   0 },
-      { AOM_CDF2(21101),   0 },
-      { AOM_CDF2(15987),   0 },
-      { AOM_CDF2(17681),   0 },
-      { AOM_CDF2(15272),   0 },
-      { AOM_CDF2(16944),   0 },
-      { AOM_CDF2(15490),   0 },
+      { AOM_CDF2(26330),  30 },
+      { AOM_CDF2(29620),   0 },
+      { AOM_CDF2(20420),  30 },
+      { AOM_CDF2(21694),  31 },
+      { AOM_CDF2(13317),  31 },
+      { AOM_CDF2(15391),  31 },
+      { AOM_CDF2(15952),  31 },
+      { AOM_CDF2(14736),  31 },
+      { AOM_CDF2(13810),   5 },
     },
     {
-      { AOM_CDF2(24996),   0 },
-      { AOM_CDF2(29488),   0 },
-      { AOM_CDF2(28130),   0 },
-      { AOM_CDF2(25285),   0 },
-      { AOM_CDF2(26292),   0 },
-      { AOM_CDF2(26699),   0 },
-      { AOM_CDF2(26963),   0 },
-      { AOM_CDF2(28550),   0 },
-      { AOM_CDF2(26414),   0 },
+      { AOM_CDF2(31646),  55 },
+      { AOM_CDF2(32393),  25 },
+      { AOM_CDF2(30802),  26 },
+      { AOM_CDF2(30485),  31 },
+      { AOM_CDF2(20759),  32 },
+      { AOM_CDF2(22159),   1 },
+      { AOM_CDF2(26832),  31 },
+      { AOM_CDF2(27351),   1 },
+      { AOM_CDF2(24696),   1 },
     },
   },
   {
     {
-      { AOM_CDF2(26810),   0 },
-      { AOM_CDF2(32361),   0 },
-      { AOM_CDF2(28087),   0 },
-      { AOM_CDF2(25777),   0 },
-      { AOM_CDF2(24932),   0 },
-      { AOM_CDF2(26103),   0 },
+      { AOM_CDF2(29308),   0 },
+      { AOM_CDF2(32550),  93 },
+      { AOM_CDF2(27963),   1 },
+      { AOM_CDF2(27618),  31 },
+      { AOM_CDF2(22367),   7 },
+      { AOM_CDF2(23478),  35 },
       { AOM_CDF2(16384),   0 },
       { AOM_CDF2(16384),   0 },
-      { AOM_CDF2(25753),   0 },
+      { AOM_CDF2(27990),   0 },
     },
     {
       { AOM_CDF2(16384),   0 },
@@ -1769,52 +1769,52 @@
 static const aom_cdf_prob default_txfm_4way_partition_type_cdf[2][2][14][CDF_SIZE(7)] = {
   {
     {
-      { AOM_CDF7(32414, 32473, 32532, 32591, 32650, 32709),   0 },
-      { AOM_CDF7( 2876, 18313, 22208, 28264, 28268, 32724),   0 },
-      { AOM_CDF7( 3923,  9350, 23275, 23279, 27495, 27499),   0 },
-      { AOM_CDF7( 6028, 14813, 20346, 23777, 26326, 29951),   0 },
-      { AOM_CDF7( 3202, 14728, 18086, 23666, 25309, 30384),   0 },
-      { AOM_CDF7( 4109,  8558, 19171, 20786, 24636, 27471),   0 },
-      { AOM_CDF7( 6859, 14500, 20365, 23744, 26424, 29870),   0 },
-      { AOM_CDF7( 3391, 11845, 16481, 21478, 25770, 30485),   0 },
-      { AOM_CDF7( 3524, 10297, 17893, 21778, 25140, 28189),   0 },
-      { AOM_CDF7( 4258, 11816, 17368, 23181, 27551, 30381),   0 },
-      { AOM_CDF7( 2794, 12996, 16651, 28785, 28789, 32724),   0 },
-      { AOM_CDF7( 2464,  6875, 17359, 17363, 27958, 27962),   0 },
-      { AOM_CDF7( 2471, 11105, 15103, 24759, 27894, 31175),   0 },
-      { AOM_CDF7( 2735,  7793, 16212, 19301, 27502, 29337),   0 },
+      { AOM_CDF7(32744, 32748, 32752, 32756, 32760, 32764),  60 },
+      { AOM_CDF7( 3006, 22888, 27132, 29972, 29976, 32724),  31 },
+      { AOM_CDF7( 3673,  8849, 27652, 27656, 29944, 29948),  31 },
+      { AOM_CDF7( 5219, 19419, 28052, 28836, 29528, 31296),  31 },
+      { AOM_CDF7( 3055, 19649, 22157, 27038, 27466, 31646),  31 },
+      { AOM_CDF7( 6044, 11255, 26170, 26493, 28585, 29584),  31 },
+      { AOM_CDF7( 5896, 20361, 25685, 27552, 28695, 31097),  31 },
+      { AOM_CDF7( 2355, 17601, 21703, 26050, 27881, 31397),  32 },
+      { AOM_CDF7( 4701, 13502, 24958, 26413, 28166, 30129),  32 },
+      { AOM_CDF7( 3319, 16449, 21641, 27154, 29260, 31512),  32 },
+      { AOM_CDF7( 2526, 17088, 19643, 29378, 29382, 32724),  31 },
+      { AOM_CDF7( 2298,  4406, 23886, 23890, 30148, 30152),  31 },
+      { AOM_CDF7( 1553, 16160, 18679, 27983, 29592, 32139),  32 },
+      { AOM_CDF7( 2316,  4714, 22731, 23797, 29514, 30077),  37 },
     },
     {
-      { AOM_CDF7(13540, 21123, 31685, 31956, 32226, 32497),   0 },
-      { AOM_CDF7( 7415, 15547, 20331, 27028, 27267, 32529),   0 },
-      { AOM_CDF7( 4894, 11490, 20427, 20640, 27023, 27236),   0 },
-      { AOM_CDF7( 5041, 10187, 18064, 22265, 25941, 29092),   0 },
-      { AOM_CDF7( 7009, 11600, 13266, 19645, 22915, 29904),   0 },
-      { AOM_CDF7( 6932,  8188, 12803, 16517, 24421, 26826),   0 },
-      { AOM_CDF7( 8947, 12382, 16998, 19382, 22593, 27492),   0 },
-      { AOM_CDF7( 5896,  9005, 11167, 15812, 20029, 29177),   0 },
-      { AOM_CDF7( 4670,  7051,  9974, 13755, 20083, 23804),   0 },
-      { AOM_CDF7( 4285,  7699, 11562, 17252, 23015, 27159),   0 },
-      { AOM_CDF7( 5364, 12080, 18435, 28666, 28711, 32723),   0 },
-      { AOM_CDF7( 3916, 11644, 16796, 16831, 29161, 29196),   0 },
-      { AOM_CDF7( 2763,  5940,  6963, 17047, 23789, 30088),   0 },
-      { AOM_CDF7( 2490,  3973,  6413, 14837, 24746, 27462),   0 },
+      { AOM_CDF7(10790, 22602, 32736, 32740, 32744, 32748),  32 },
+      { AOM_CDF7(14384, 19116, 26545, 28687, 28691, 32724),  31 },
+      { AOM_CDF7(13910, 21690, 26343, 26347, 28432, 28436),  31 },
+      { AOM_CDF7(15891, 21712, 28890, 29571, 30307, 31363),  32 },
+      { AOM_CDF7(15946, 19447, 20270, 23423, 23858, 31148),  32 },
+      { AOM_CDF7(16053, 16957, 20312, 20924, 24770, 25959),  32 },
+      { AOM_CDF7(18479, 23053, 26582, 26966, 27567, 29836),  62 },
+      { AOM_CDF7( 9312, 11882, 14354, 17792, 19827, 29477),  62 },
+      { AOM_CDF7( 8490, 10668, 13295, 15353, 19952, 22575),  62 },
+      { AOM_CDF7( 6404, 12066, 16173, 20041, 24512, 28421),  62 },
+      { AOM_CDF7(10019, 14455, 17658, 27012, 27016, 32724),  37 },
+      { AOM_CDF7( 9479, 14904, 19374, 19378, 28027, 28031),  37 },
+      { AOM_CDF7( 3717,  7198,  8103, 20546, 23558, 31447),  62 },
+      { AOM_CDF7( 4058,  5429,  8987, 13978, 25126, 26655),  62 },
     },
   },
   {
     {
-      { AOM_CDF7( 8192, 12288, 16384, 20480, 24576, 28672),   0 },
-      { AOM_CDF7( 1425, 11398, 19946, 24220, 25645, 31343),   0 },
-      { AOM_CDF7( 2621, 11796, 27525, 28836, 30147, 31457),   0 },
-      { AOM_CDF7( 1489, 13405, 23831, 25321, 29789, 31279),   0 },
-      { AOM_CDF7( 2185, 15292, 19661, 26214, 28399, 30583),   0 },
-      { AOM_CDF7( 3277, 16384, 22938, 26214, 29491, 31130),   0 },
-      { AOM_CDF7( 5461, 16384, 21845, 25486, 27307, 29127),   0 },
+      { AOM_CDF7(32434, 32490, 32545, 32601, 32657, 32712),  50 },
+      { AOM_CDF7( 1491, 14241, 29930, 32517, 32524, 32724),  57 },
+      { AOM_CDF7( 1719, 16525, 31000, 31004, 32575, 32579),  30 },
+      { AOM_CDF7( 1645, 16749, 29324, 30425, 32016, 32485),  62 },
+      { AOM_CDF7( 2908, 15802, 24689, 28470, 32122, 32542),  25 },
+      { AOM_CDF7( 3470, 17931, 25841, 29589, 31907, 32465),  43 },
+      { AOM_CDF7( 5638, 19594, 28693, 29977, 30703, 32154),  50 },
       { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
       { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
       { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
-      { AOM_CDF7( 2185,  8738, 21845, 24030, 26214, 30583),   0 },
-      { AOM_CDF7( 4681, 18725, 26526, 28087, 29647, 31208),   0 },
+      { AOM_CDF7( 2734, 12129, 30342, 31805, 31844, 32724),  50 },
+      { AOM_CDF7( 3849, 21783, 31043, 31056, 32181, 32193),  65 },
       { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
       { AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
     },
@@ -1838,29 +1838,29 @@
 };
 
 static const aom_cdf_prob default_filter_dir_cdf[4][CDF_SIZE(3)] = {
-  { AOM_CDF3(16384, 24576),   1 },
-  { AOM_CDF3(16384, 24576),   1 },
-  { AOM_CDF3(16384, 24576),   1 },
-  { AOM_CDF3(16384, 24576),  32 },
+  { AOM_CDF3(10923, 21845),   0 },
+  { AOM_CDF3( 8795, 15105),   6 },
+  { AOM_CDF3(10433, 15974),  32 },
+  { AOM_CDF3(17085, 21689),  32 },
 };
 
 static const aom_cdf_prob default_cfl_cdf[3][CDF_SIZE(2)] = {
-  { AOM_CDF2(18484),   6 },
-  { AOM_CDF2( 8591),   6 },
-  { AOM_CDF2( 2151),   0 },
+  { AOM_CDF2(20441),  30 },
+  { AOM_CDF2(11610),   6 },
+  { AOM_CDF2( 4643),   0 },
 };
 
 static const aom_cdf_prob default_region_type_cdf[4][CDF_SIZE(2)] = {
-  { AOM_CDF2( 8192),   0 },
-  { AOM_CDF2( 8192),   0 },
-  { AOM_CDF2( 8192),   0 },
-  { AOM_CDF2( 8192),   0 },
+  { AOM_CDF2( 2635),  25 },
+  { AOM_CDF2(  883),  25 },
+  { AOM_CDF2(  503),  50 },
+  { AOM_CDF2(  279),  55 },
 };
 
 static const aom_cdf_prob default_morph_pred_cdf[3][CDF_SIZE(2)] = {
-  { AOM_CDF2(19186),  50 },
-  { AOM_CDF2(16483),   1 },
-  { AOM_CDF2( 8242),  95 },
+  { AOM_CDF2(31715),  55 },
+  { AOM_CDF2(19667),   1 },
+  { AOM_CDF2(10555),  91 },
 };
 
 static const aom_cdf_prob default_seg_tree_cdf[CDF_SIZE(8)] = { AOM_CDF8( 4096,  8192, 12288, 16384, 20480, 24576, 28672),   0 };
@@ -1874,9 +1874,9 @@
 };
 
 static const aom_cdf_prob default_spatial_pred_seg_tree_cdf[3][CDF_SIZE(8)] = {
-  { AOM_CDF8( 5622,  7893, 16093, 18233, 27809, 28373, 32533),   0 },
-  { AOM_CDF8(14274, 18230, 22557, 24935, 29980, 30851, 32344),   0 },
-  { AOM_CDF8(27527, 28487, 28723, 28890, 32397, 32647, 32679),   0 },
+  { AOM_CDF8( 4096,  8192, 12288, 16384, 20480, 24576, 28672),   0 },
+  { AOM_CDF8( 4096,  8192, 12288, 16384, 20480, 24576, 28672),   0 },
+  { AOM_CDF8( 4096,  8192, 12288, 16384, 20480, 24576, 28672),   0 },
 };
 
 static const aom_cdf_prob default_spatial_pred_seg_tree_cdf1[3][CDF_SIZE(8)] = {
diff --git a/av1/common/entropy_inits_mv.h b/av1/common/entropy_inits_mv.h
index 88b21b1..d4917ae 100644
--- a/av1/common/entropy_inits_mv.h
+++ b/av1/common/entropy_inits_mv.h
@@ -22,66 +22,66 @@
 /* clang-format off */
 
 static const nmv_context default_nmv_context = {
-{ AOM_CDF2(24576),   0 },
+{ AOM_CDF2(31579),  25 },
 {
-{ AOM_CDF5( 6847, 15990, 24873, 32100),   0 },
-{ AOM_CDF6( 8452, 19730, 26138, 30154, 32100),   0 },
-{ AOM_CDF6( 6553, 13106, 19659, 26212, 32100),   0 },
-{ AOM_CDF7( 5062, 12676, 19127, 24565, 29511, 32100),   0 },
-{ AOM_CDF7( 4553, 16572, 24700, 28964, 31428, 32100),   0 },
-{ AOM_CDF8( 2750, 12194, 20615, 25661, 28862, 31157, 32100),   0 },
-{ AOM_CDF8( 7886, 19300, 26400, 29900, 31400, 32100, 32740),   0 },
+{ AOM_CDF5( 4460, 12999, 22505, 30840),  38 },
+{ AOM_CDF6( 7519, 18907, 25563, 29875, 31983),  27 },
+{ AOM_CDF6( 5461, 10923, 16384, 21845, 27307),   0 },
+{ AOM_CDF7( 8680, 13723, 18208, 22686, 26722, 30020),   5 },
+{ AOM_CDF7( 4324, 15300, 23690, 28697, 31282, 32359),   1 },
+{ AOM_CDF8( 7497, 17301, 23848, 27438, 29395, 30879, 32003),  31 },
+{ AOM_CDF8(10667, 20239, 25883, 29670, 31400, 32153, 32579),   0 },
 },
 {
-{ AOM_CDF6(17356, 28590, 32415, 32740, 32760),   0 },
-{ AOM_CDF6(21505, 30000, 31700, 31819, 32100),   0 },
-{ AOM_CDF7( 5461, 10922, 16383, 21844, 27305, 32100),   0 },
-{ AOM_CDF7(21567, 30194, 32730, 32755, 32760, 32764),   0 },
-{ AOM_CDF8(20234, 28560, 30530, 31246, 31694, 32141, 32740),   0 },
-{ AOM_CDF8(18126, 26500, 30750, 32100, 32185, 32400, 32740),   0 },
-{ AOM_CDF8(16384, 24576, 28672, 29696, 29970, 30244, 30518),   0 },
+{ AOM_CDF6(21329, 30564, 32589, 32649, 32708),  50 },
+{ AOM_CDF6(24250, 31806, 32676, 32722, 32732),  50 },
+{ AOM_CDF7( 4681,  9362, 14043, 18725, 23406, 28087),   0 },
+{ AOM_CDF7(19978, 30160, 32564, 32732, 32736, 32740),   1 },
+{ AOM_CDF8(19707, 28414, 31240, 31648, 32692, 32717, 32721),  25 },
+{ AOM_CDF8(18469, 27427, 31562, 32652, 32724, 32728, 32732),  31 },
+{ AOM_CDF8(17810, 25196, 29372, 31953, 32564, 32720, 32724),  55 },
 },
 { AOM_CDF2(16384),   0 },
 {
-  { AOM_CDF2( 3268),   1 },
-  { AOM_CDF2(17309),  75 },
+  { AOM_CDF2(14587),  36 },
+  { AOM_CDF2(20966),  75 },
 },
-{ AOM_CDF2(16384),  75 },
+{ AOM_CDF2(13189),   0 },
 {
   {
-    { AOM_CDF2(16786),  75 },
-    { AOM_CDF2(19319),  78 },
-    { AOM_CDF2(18504),  93 },
-    { AOM_CDF2(18606),  93 },
-    { AOM_CDF2(19609),  93 },
-    { AOM_CDF2(20222),  93 },
-    { AOM_CDF2(20715),  93 },
-    { AOM_CDF2(22309),  93 },
-    { AOM_CDF2(22194),  93 },
-    { AOM_CDF2(23081),  95 },
-    { AOM_CDF2(25072),   1 },
-    { AOM_CDF2(29343),  50 },
+    { AOM_CDF2(17943),  93 },
+    { AOM_CDF2(18934),  93 },
+    { AOM_CDF2(18928),  93 },
+    { AOM_CDF2(18696),  93 },
+    { AOM_CDF2(19044),  93 },
+    { AOM_CDF2(20362),  93 },
+    { AOM_CDF2(20426),  93 },
+    { AOM_CDF2(22563),  93 },
+    { AOM_CDF2(22190),  93 },
+    { AOM_CDF2(23458),  90 },
+    { AOM_CDF2(26227),   2 },
+    { AOM_CDF2(30765),  50 },
     { AOM_CDF2(16384),   0 },
     { AOM_CDF2(16384),   0 },
   },
 },
 {
-  { AOM_CDF2( 3371),  78 },
-  { AOM_CDF2( 5706),  93 },
+  { AOM_CDF2( 5663),  25 },
+  { AOM_CDF2( 4856),  90 },
 },
 {
-  { AOM_CDF2(13012),  75 },
-  { AOM_CDF2(13771),   0 },
-  { AOM_CDF2(13429),   1 },
-  { AOM_CDF2(14771),   1 },
+  { AOM_CDF2(13445),   1 },
+  { AOM_CDF2(13541),   1 },
+  { AOM_CDF2(14045),   1 },
+  { AOM_CDF2(12888),  31 },
 },
-{ AOM_CDF4(    4, 19409, 32748),   1 },
+{ AOM_CDF4(    4, 17705, 32748),   1 },
   {
     {
-      { AOM_CDF8( 7804, 11354, 12626, 18581, 24598, 29144, 31608),   1 },
+      { AOM_CDF8(10549, 15298, 16241, 22533, 27449, 30520, 32080),  26 },
     },
     {
-      { AOM_CDF8( 7392, 11106, 12422, 18167, 24480, 29230, 31714),   1 },
+      { AOM_CDF8( 9414, 14965, 15966, 22465, 27468, 30628, 32144),  26 },
     },
   },
 };