ec_smallmul: Convert CDFs to iCDFs.

Hoists the iCDF conversion outside of the daala code.
We directly store 32768 - cdf[i] in each cdf, to avoid having to
convert the whole array every time a symbol is coded.

This works with ec_multisymbol, new_tokenset, and ec_adapt.

Compared to Change-Id Idbbd3743e9189146cb519d5b984bdabd69e3f4c0,
this improves decoder runtimes by 1.15% at QP=55 and 2.64% at
QP=20.

The overall slowdown of ec_smallmul is now 0.12% at QP=55 and
0.44% at QP=20.

Encoder output should not change, and all streams should remain
decodable without decoder changes.

Change-Id: I06b8b75b667bb1bc4ddffc78f895e48a09f4c578
diff --git a/aom_dsp/daalaboolreader.h b/aom_dsp/daalaboolreader.h
index 9ce03c7..357f40d 100644
--- a/aom_dsp/daalaboolreader.h
+++ b/aom_dsp/daalaboolreader.h
@@ -113,16 +113,7 @@
 static INLINE int daala_read_symbol(daala_reader *r, const aom_cdf_prob *cdf,
                                     int nsymbs) {
   int symb;
-#if CONFIG_EC_SMALLMUL
-  {
-    aom_cdf_prob icdf[16];
-    int i;
-    for (i = 0; i < nsymbs; i++) icdf[i] = OD_ICDF(cdf[i]);
-    symb = od_ec_decode_cdf_q15(&r->ec, icdf, nsymbs);
-  }
-#else
   symb = od_ec_decode_cdf_q15(&r->ec, cdf, nsymbs);
-#endif
 
 #if CONFIG_BITSTREAM_DEBUG
   {
diff --git a/aom_dsp/daalaboolwriter.h b/aom_dsp/daalaboolwriter.h
index 00da5a0..bbaf53c 100644
--- a/aom_dsp/daalaboolwriter.h
+++ b/aom_dsp/daalaboolwriter.h
@@ -77,16 +77,7 @@
   bitstream_queue_push(symb, cdf, nsymbs);
 #endif
 
-#if CONFIG_EC_SMALLMUL
-  {
-    aom_cdf_prob icdf[16];
-    int i;
-    for (i = 0; i < nsymbs; i++) icdf[i] = OD_ICDF(cdf[i]);
-    od_ec_encode_cdf_q15(&w->ec, symb, icdf, nsymbs);
-  }
-#else
   od_ec_encode_cdf_q15(&w->ec, symb, cdf, nsymbs);
-#endif
 }
 
 #ifdef __cplusplus
diff --git a/aom_dsp/prob.c b/aom_dsp/prob.c
index 9fbf0d1..c60bfda 100644
--- a/aom_dsp/prob.c
+++ b/aom_dsp/prob.c
@@ -17,10 +17,6 @@
 
 #include "aom_dsp/prob.h"
 
-#if CONFIG_DAALA_EC
-#include "aom_dsp/entcode.h"
-#endif
-
 const uint8_t aom_norm[256] = {
   0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
   3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -202,8 +198,9 @@
   /* Extract the cdf, index, path and length */
   tree_node_extract(symb, 0, 0, cdf, index, path, len);
   /* Convert to CDF */
+  cdf[0] = AOM_ICDF(cdf[0]);
   for (i = 1; i < nsymbs; i++) {
-    cdf[i] = cdf[i - 1] + cdf[i];
+    cdf[i] = AOM_ICDF(AOM_ICDF(cdf[i - 1]) + cdf[i]);
   }
 // Store symbol count at the end of the CDF
 #if CONFIG_EC_ADAPT
diff --git a/aom_dsp/prob.h b/aom_dsp/prob.h
index 9921623..8085929 100644
--- a/aom_dsp/prob.h
+++ b/aom_dsp/prob.h
@@ -20,6 +20,10 @@
 #include "aom_ports/bitops.h"
 #include "aom_ports/mem.h"
 
+#if CONFIG_DAALA_EC
+#include "aom_dsp/entcode.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -36,6 +40,12 @@
 #define CDF_PROB_BITS 15
 #define CDF_PROB_TOP (1 << CDF_PROB_BITS)
 
+#if CONFIG_DAALA_EC
+#define AOM_ICDF OD_ICDF
+#else
+#define AOM_ICDF(x) (x)
+#endif
+
 #define MAX_PROB 255
 
 #define aom_prob_half ((aom_prob)128)
@@ -152,13 +162,20 @@
   int diff;
 #if 1
   const int tmp0 = 1 << rate2;
-  tmp = tmp0;
+  tmp = AOM_ICDF(tmp0);
   diff = ((CDF_PROB_TOP - (nsymbs << rate2)) >> rate) << rate;
-  // Single loop (faster)
+// Single loop (faster)
+#if CONFIG_DAALA_EC && CONFIG_EC_SMALLMUL
+  for (i = 0; i < nsymbs - 1; ++i, tmp -= tmp0) {
+    tmp -= (i == val ? diff : 0);
+    cdf[i] += ((tmp - cdf[i]) >> rate);
+  }
+#else
   for (i = 0; i < nsymbs - 1; ++i, tmp += tmp0) {
     tmp += (i == val ? diff : 0);
     cdf[i] -= ((cdf[i] - tmp) >> rate);
   }
+#endif
 #else
   for (i = 0; i < nsymbs; ++i) {
     tmp = (i + 1) << rate2;
diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index fcf8bbd..e929e9f 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -37,47 +37,88 @@
 
 #if CONFIG_NEW_MULTISYMBOL
 /* Extra bits coded from LSB to MSB */
-const aom_cdf_prob av1_cat1_cdf0[CDF_SIZE(2)] = { 20352, 32768, 0 };
+const aom_cdf_prob av1_cat1_cdf0[CDF_SIZE(2)] = { AOM_ICDF(20352),
+                                                  AOM_ICDF(32768), 0 };
 const aom_cdf_prob *av1_cat1_cdf[] = { av1_cat1_cdf0 };
 
-const aom_cdf_prob av1_cat2_cdf0[CDF_SIZE(4)] = { 11963, 21121, 27719, 32768,
-                                                  0 };
+const aom_cdf_prob av1_cat2_cdf0[CDF_SIZE(4)] = {
+  AOM_ICDF(11963), AOM_ICDF(21121), AOM_ICDF(27719), AOM_ICDF(32768), 0
+};
 const aom_cdf_prob *av1_cat2_cdf[] = { av1_cat2_cdf0 };
 const aom_cdf_prob av1_cat3_cdf0[CDF_SIZE(8)] = {
-  7001, 12802, 17911, 22144, 25503, 28286, 30737, 32768, 0
+  AOM_ICDF(7001),  AOM_ICDF(12802), AOM_ICDF(17911),
+  AOM_ICDF(22144), AOM_ICDF(25503), AOM_ICDF(28286),
+  AOM_ICDF(30737), AOM_ICDF(32768), 0
 };
 const aom_cdf_prob *av1_cat3_cdf[] = { av1_cat3_cdf0 };
 
-const aom_cdf_prob av1_cat4_cdf0[CDF_SIZE(16)] = {
-  3934,  7460,  10719, 13640, 16203, 18500, 20624, 22528, 24316,
-  25919, 27401, 28729, 29894, 30938, 31903, 32768, 0
-};
+const aom_cdf_prob av1_cat4_cdf0[CDF_SIZE(16)] = { AOM_ICDF(3934),
+                                                   AOM_ICDF(7460),
+                                                   AOM_ICDF(10719),
+                                                   AOM_ICDF(13640),
+                                                   AOM_ICDF(16203),
+                                                   AOM_ICDF(18500),
+                                                   AOM_ICDF(20624),
+                                                   AOM_ICDF(22528),
+                                                   AOM_ICDF(24316),
+                                                   AOM_ICDF(25919),
+                                                   AOM_ICDF(27401),
+                                                   AOM_ICDF(28729),
+                                                   AOM_ICDF(29894),
+                                                   AOM_ICDF(30938),
+                                                   AOM_ICDF(31903),
+                                                   AOM_ICDF(32768),
+                                                   0 };
 const aom_cdf_prob *av1_cat4_cdf[] = { av1_cat4_cdf0 };
 
-const aom_cdf_prob av1_cat5_cdf0[CDF_SIZE(16)] = {
-  2942,  5794,  8473,  11069, 13469, 15795, 17980, 20097, 21952,
-  23750, 25439, 27076, 28589, 30056, 31434, 32768, 0
-};
-const aom_cdf_prob av1_cat5_cdf1[CDF_SIZE(2)] = { 23040, 32768, 0 };
+const aom_cdf_prob av1_cat5_cdf0[CDF_SIZE(16)] = { AOM_ICDF(2942),
+                                                   AOM_ICDF(5794),
+                                                   AOM_ICDF(8473),
+                                                   AOM_ICDF(11069),
+                                                   AOM_ICDF(13469),
+                                                   AOM_ICDF(15795),
+                                                   AOM_ICDF(17980),
+                                                   AOM_ICDF(20097),
+                                                   AOM_ICDF(21952),
+                                                   AOM_ICDF(23750),
+                                                   AOM_ICDF(25439),
+                                                   AOM_ICDF(27076),
+                                                   AOM_ICDF(28589),
+                                                   AOM_ICDF(30056),
+                                                   AOM_ICDF(31434),
+                                                   AOM_ICDF(32768),
+                                                   0 };
+const aom_cdf_prob av1_cat5_cdf1[CDF_SIZE(2)] = { AOM_ICDF(23040),
+                                                  AOM_ICDF(32768), 0 };
 const aom_cdf_prob *av1_cat5_cdf[] = { av1_cat5_cdf0, av1_cat5_cdf1 };
 
-const aom_cdf_prob av1_cat6_cdf0[CDF_SIZE(16)] = { 2382,  4727,  7036,  9309,
-                                                   11512, 13681, 15816, 17918,
-                                                   19892, 21835, 23748, 25632,
-                                                   27458, 29255, 31024, 32768 };
-const aom_cdf_prob av1_cat6_cdf1[CDF_SIZE(16)] = { 9314,  15584, 19741, 22540,
-                                                   25391, 27310, 28583, 29440,
-                                                   30493, 31202, 31672, 31988,
-                                                   32310, 32527, 32671, 32768 };
-const aom_cdf_prob av1_cat6_cdf2[CDF_SIZE(16)] = { 29548, 31129, 31960, 32004,
-                                                   32473, 32498, 32511, 32512,
-                                                   32745, 32757, 32763, 32764,
-                                                   32765, 32766, 32767, 32768 };
-const aom_cdf_prob av1_cat6_cdf3[CDF_SIZE(16)] = { 32006, 32258, 32510, 32512,
-                                                   32638, 32639, 32640, 32641,
-                                                   32761, 32762, 32763, 32764,
-                                                   32765, 32766, 32767, 32768 };
-const aom_cdf_prob av1_cat6_cdf4[CDF_SIZE(4)] = { 32513, 32641, 32767, 32768 };
+const aom_cdf_prob av1_cat6_cdf0[CDF_SIZE(16)] = {
+  AOM_ICDF(2382),  AOM_ICDF(4727),  AOM_ICDF(7036),  AOM_ICDF(9309),
+  AOM_ICDF(11512), AOM_ICDF(13681), AOM_ICDF(15816), AOM_ICDF(17918),
+  AOM_ICDF(19892), AOM_ICDF(21835), AOM_ICDF(23748), AOM_ICDF(25632),
+  AOM_ICDF(27458), AOM_ICDF(29255), AOM_ICDF(31024), AOM_ICDF(32768)
+};
+const aom_cdf_prob av1_cat6_cdf1[CDF_SIZE(16)] = {
+  AOM_ICDF(9314),  AOM_ICDF(15584), AOM_ICDF(19741), AOM_ICDF(22540),
+  AOM_ICDF(25391), AOM_ICDF(27310), AOM_ICDF(28583), AOM_ICDF(29440),
+  AOM_ICDF(30493), AOM_ICDF(31202), AOM_ICDF(31672), AOM_ICDF(31988),
+  AOM_ICDF(32310), AOM_ICDF(32527), AOM_ICDF(32671), AOM_ICDF(32768)
+};
+const aom_cdf_prob av1_cat6_cdf2[CDF_SIZE(16)] = {
+  AOM_ICDF(29548), AOM_ICDF(31129), AOM_ICDF(31960), AOM_ICDF(32004),
+  AOM_ICDF(32473), AOM_ICDF(32498), AOM_ICDF(32511), AOM_ICDF(32512),
+  AOM_ICDF(32745), AOM_ICDF(32757), AOM_ICDF(32763), AOM_ICDF(32764),
+  AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)
+};
+const aom_cdf_prob av1_cat6_cdf3[CDF_SIZE(16)] = {
+  AOM_ICDF(32006), AOM_ICDF(32258), AOM_ICDF(32510), AOM_ICDF(32512),
+  AOM_ICDF(32638), AOM_ICDF(32639), AOM_ICDF(32640), AOM_ICDF(32641),
+  AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+  AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)
+};
+const aom_cdf_prob av1_cat6_cdf4[CDF_SIZE(4)] = {
+  AOM_ICDF(32513), AOM_ICDF(32641), AOM_ICDF(32767), AOM_ICDF(32768)
+};
 const aom_cdf_prob *av1_cat6_cdf[] = {
   av1_cat6_cdf0, av1_cat6_cdf1, av1_cat6_cdf2, av1_cat6_cdf3, av1_cat6_cdf4
 };
@@ -4694,657 +4735,1185 @@
   {     // Y plane
     {   // Intra
       { // Band 0
-        { 25024, 25863, 27361, 29796, 30374, 32768 },
-        { 10816, 14127, 17116, 23516, 24999, 32768 },
-        { 1088, 6358, 8428, 16648, 18276, 32768 } },
+        { AOM_ICDF(25024), AOM_ICDF(25863), AOM_ICDF(27361), AOM_ICDF(29796),
+          AOM_ICDF(30374), AOM_ICDF(32768) },
+        { AOM_ICDF(10816), AOM_ICDF(14127), AOM_ICDF(17116), AOM_ICDF(23516),
+          AOM_ICDF(24999), AOM_ICDF(32768) },
+        { AOM_ICDF(1088), AOM_ICDF(6358), AOM_ICDF(8428), AOM_ICDF(16648),
+          AOM_ICDF(18276), AOM_ICDF(32768) } },
       { // Band 1
-        {14529, 18769, 29100, 29634, 32768 },
-        {12993, 17117, 28404, 28988, 32768 },
-        {11201, 14084, 25818, 26504, 32768 },
-        {9793, 11267, 21775, 22451, 32768 },
-        {7105, 7562, 15777, 16225, 32768 },
-        {3905, 3966, 8359, 8526, 32768 } },
+        {AOM_ICDF(14529), AOM_ICDF(18769), AOM_ICDF(29100), AOM_ICDF(29634),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12993), AOM_ICDF(17117), AOM_ICDF(28404), AOM_ICDF(28988),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11201), AOM_ICDF(14084), AOM_ICDF(25818), AOM_ICDF(26504),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9793), AOM_ICDF(11267), AOM_ICDF(21775), AOM_ICDF(22451),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7105), AOM_ICDF(7562), AOM_ICDF(15777), AOM_ICDF(16225),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3905), AOM_ICDF(3966), AOM_ICDF(8359), AOM_ICDF(8526),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {20033, 23643, 31102, 31374, 32768 },
-        {16321, 20350, 30167, 30546, 32768 },
-        {12993, 15512, 26859, 27396, 32768 },
-        {10305, 11659, 21669, 22330, 32768 },
-        {7361, 7819, 15450, 15940, 32768 },
-        {3521, 3580, 7805, 7976, 32768 } },
+        {AOM_ICDF(20033), AOM_ICDF(23643), AOM_ICDF(31102), AOM_ICDF(31374),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16321), AOM_ICDF(20350), AOM_ICDF(30167), AOM_ICDF(30546),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12993), AOM_ICDF(15512), AOM_ICDF(26859), AOM_ICDF(27396),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10305), AOM_ICDF(11659), AOM_ICDF(21669), AOM_ICDF(22330),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7361), AOM_ICDF(7819), AOM_ICDF(15450), AOM_ICDF(15940),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3521), AOM_ICDF(3580), AOM_ICDF(7805), AOM_ICDF(7976),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {21057, 25460, 31740, 31952, 32768 },
-        {16449, 21173, 30761, 31092, 32768 },
-        {11841, 14615, 26188, 26824, 32768 },
-        {7745, 8991, 18937, 19707, 32768 },
-        {4417, 4706, 10342, 10890, 32768 },
-        {7617, 8392, 17295, 17915, 32768 } },
+        {AOM_ICDF(21057), AOM_ICDF(25460), AOM_ICDF(31740), AOM_ICDF(31952),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16449), AOM_ICDF(21173), AOM_ICDF(30761), AOM_ICDF(31092),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11841), AOM_ICDF(14615), AOM_ICDF(26188), AOM_ICDF(26824),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7745), AOM_ICDF(8991), AOM_ICDF(18937), AOM_ICDF(19707),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4417), AOM_ICDF(4706), AOM_ICDF(10342), AOM_ICDF(10890),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7617), AOM_ICDF(8392), AOM_ICDF(17295), AOM_ICDF(17915),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {20417, 26452, 32166, 32321, 32768 },
-        {15809, 21634, 30947, 31298, 32768 },
-        {10049, 12176, 23495, 24229, 32768 },
-        {5953, 6731, 16166, 16798, 32768 },
-        {6081, 6188, 8114, 8764, 32768 },
-        {2113, 2291, 4448, 5527, 32768 } },
+        {AOM_ICDF(20417), AOM_ICDF(26452), AOM_ICDF(32166), AOM_ICDF(32321),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15809), AOM_ICDF(21634), AOM_ICDF(30947), AOM_ICDF(31298),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10049), AOM_ICDF(12176), AOM_ICDF(23495), AOM_ICDF(24229),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5953), AOM_ICDF(6731), AOM_ICDF(16166), AOM_ICDF(16798),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6081), AOM_ICDF(6188), AOM_ICDF(8114), AOM_ICDF(8764),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2113), AOM_ICDF(2291), AOM_ICDF(4448), AOM_ICDF(5527),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {9153, 25905, 31431, 31934, 32768 },
-        {9025, 23345, 30033, 30965, 32768 },
-        {5953, 13835, 22032, 24664, 32768 },
-        {6337, 11435, 18366, 21418, 32768 },
-        {3137, 4871, 8519, 12426, 32768 },
-        {1857, 2727, 5540, 8757, 32768 } } },
+        {AOM_ICDF(9153), AOM_ICDF(25905), AOM_ICDF(31431), AOM_ICDF(31934),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9025), AOM_ICDF(23345), AOM_ICDF(30033), AOM_ICDF(30965),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5953), AOM_ICDF(13835), AOM_ICDF(22032), AOM_ICDF(24664),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6337), AOM_ICDF(11435), AOM_ICDF(18366), AOM_ICDF(21418),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3137), AOM_ICDF(4871), AOM_ICDF(8519), AOM_ICDF(12426),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(1857), AOM_ICDF(2727), AOM_ICDF(5540), AOM_ICDF(8757),
+         AOM_ICDF(32768) } } },
     {   // Intra
       { // Band 0
-        { 24512, 26673, 28962, 31929, 32126, 32768 },
-        { 15936, 21711, 25569, 30899, 31305, 32768 },
-        { 3264, 14756, 20107, 29407, 30032, 32768 } },
+        { AOM_ICDF(24512), AOM_ICDF(26673), AOM_ICDF(28962), AOM_ICDF(31929),
+          AOM_ICDF(32126), AOM_ICDF(32768) },
+        { AOM_ICDF(15936), AOM_ICDF(21711), AOM_ICDF(25569), AOM_ICDF(30899),
+          AOM_ICDF(31305), AOM_ICDF(32768) },
+        { AOM_ICDF(3264), AOM_ICDF(14756), AOM_ICDF(20107), AOM_ICDF(29407),
+          AOM_ICDF(30032), AOM_ICDF(32768) } },
       { // Band 1
-        {21313, 26020, 32523, 32575, 32768 },
-        {18369, 24215, 32291, 32391, 32768 },
-        {15297, 19637, 30414, 30752, 32768 },
-        {11713, 14040, 25408, 26033, 32768 },
-        {9537, 10173, 18839, 19315, 32768 },
-        {9025, 9093, 13987, 14115, 32768 } },
+        {AOM_ICDF(21313), AOM_ICDF(26020), AOM_ICDF(32523), AOM_ICDF(32575),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(18369), AOM_ICDF(24215), AOM_ICDF(32291), AOM_ICDF(32391),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15297), AOM_ICDF(19637), AOM_ICDF(30414), AOM_ICDF(30752),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11713), AOM_ICDF(14040), AOM_ICDF(25408), AOM_ICDF(26033),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9537), AOM_ICDF(10173), AOM_ICDF(18839), AOM_ICDF(19315),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9025), AOM_ICDF(9093), AOM_ICDF(13987), AOM_ICDF(14115),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {22721, 27599, 32592, 32636, 32768 },
-        {19009, 24676, 32258, 32367, 32768 },
-        {12737, 16769, 28739, 29247, 32768 },
-        {8769, 10956, 21941, 22840, 32768 },
-        {6721, 7678, 15319, 16290, 32768 },
-        {4417, 4430, 4583, 5712, 32768 } },
+        {AOM_ICDF(22721), AOM_ICDF(27599), AOM_ICDF(32592), AOM_ICDF(32636),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(19009), AOM_ICDF(24676), AOM_ICDF(32258), AOM_ICDF(32367),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12737), AOM_ICDF(16769), AOM_ICDF(28739), AOM_ICDF(29247),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(8769), AOM_ICDF(10956), AOM_ICDF(21941), AOM_ICDF(22840),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6721), AOM_ICDF(7678), AOM_ICDF(15319), AOM_ICDF(16290),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4417), AOM_ICDF(4430), AOM_ICDF(4583), AOM_ICDF(5712),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {22849, 28333, 32633, 32671, 32768 },
-        {18497, 24619, 32184, 32315, 32768 },
-        {11841, 14640, 27251, 27752, 32768 },
-        {8385, 10154, 18339, 19621, 32768 },
-        {5697, 6977, 13787, 15289, 32768 },
-        {193, 194, 384, 479, 32768 } },
+        {AOM_ICDF(22849), AOM_ICDF(28333), AOM_ICDF(32633), AOM_ICDF(32671),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(18497), AOM_ICDF(24619), AOM_ICDF(32184), AOM_ICDF(32315),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11841), AOM_ICDF(14640), AOM_ICDF(27251), AOM_ICDF(27752),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(8385), AOM_ICDF(10154), AOM_ICDF(18339), AOM_ICDF(19621),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5697), AOM_ICDF(6977), AOM_ICDF(13787), AOM_ICDF(15289),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(194), AOM_ICDF(384), AOM_ICDF(479),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {20417, 28167, 32552, 32621, 32768 },
-        {16833, 23968, 31991, 32174, 32768 },
-        {10433, 13387, 26356, 26951, 32768 },
-        {5057, 6823, 18967, 19843, 32768 },
-        {5697, 6479, 11672, 13052, 32768 },
-        {2241, 2265, 6355, 6432, 32768 } },
+        {AOM_ICDF(20417), AOM_ICDF(28167), AOM_ICDF(32552), AOM_ICDF(32621),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16833), AOM_ICDF(23968), AOM_ICDF(31991), AOM_ICDF(32174),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10433), AOM_ICDF(13387), AOM_ICDF(26356), AOM_ICDF(26951),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5057), AOM_ICDF(6823), AOM_ICDF(18967), AOM_ICDF(19843),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5697), AOM_ICDF(6479), AOM_ICDF(11672), AOM_ICDF(13052),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2241), AOM_ICDF(2265), AOM_ICDF(6355), AOM_ICDF(6432),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {12097, 28717, 32406, 32555, 32768 },
-        {10433, 26113, 31504, 31975, 32768 },
-        {5825, 14284, 21349, 24461, 32768 },
-        {4545, 8454, 12648, 17501, 32768 },
-        {193, 7173, 15272, 19322, 32768 },
-        {2113, 2183, 7202, 7377, 32768 } } } },
+        {AOM_ICDF(12097), AOM_ICDF(28717), AOM_ICDF(32406), AOM_ICDF(32555),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10433), AOM_ICDF(26113), AOM_ICDF(31504), AOM_ICDF(31975),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5825), AOM_ICDF(14284), AOM_ICDF(21349), AOM_ICDF(24461),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4545), AOM_ICDF(8454), AOM_ICDF(12648), AOM_ICDF(17501),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(7173), AOM_ICDF(15272), AOM_ICDF(19322),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2113), AOM_ICDF(2183), AOM_ICDF(7202), AOM_ICDF(7377),
+         AOM_ICDF(32768) } } } },
   {     // UV plane
     {   // Inter
       { // Band 0
-        { 27456, 28244, 31289, 32358, 32534, 32768 },
-        { 16960, 21207, 26511, 30539, 31190, 32768 },
-        { 5440, 13412, 18469, 26423, 27669, 32768 } },
+        { AOM_ICDF(27456), AOM_ICDF(28244), AOM_ICDF(31289), AOM_ICDF(32358),
+          AOM_ICDF(32534), AOM_ICDF(32768) },
+        { AOM_ICDF(16960), AOM_ICDF(21207), AOM_ICDF(26511), AOM_ICDF(30539),
+          AOM_ICDF(31190), AOM_ICDF(32768) },
+        { AOM_ICDF(5440), AOM_ICDF(13412), AOM_ICDF(18469), AOM_ICDF(26423),
+          AOM_ICDF(27669), AOM_ICDF(32768) } },
       { // Band 1
-        {17857, 26327, 31983, 32219, 32768 },
-        {16065, 24198, 31431, 31785, 32768 },
-        {12865, 18011, 28454, 29166, 32768 },
-        {9665, 12501, 24331, 25147, 32768 },
-        {2753, 3121, 12661, 13034, 32768 },
-        {4033, 4140, 11834, 11977, 32768 } },
+        {AOM_ICDF(17857), AOM_ICDF(26327), AOM_ICDF(31983), AOM_ICDF(32219),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16065), AOM_ICDF(24198), AOM_ICDF(31431), AOM_ICDF(31785),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12865), AOM_ICDF(18011), AOM_ICDF(28454), AOM_ICDF(29166),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9665), AOM_ICDF(12501), AOM_ICDF(24331), AOM_ICDF(25147),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2753), AOM_ICDF(3121), AOM_ICDF(12661), AOM_ICDF(13034),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4033), AOM_ICDF(4140), AOM_ICDF(11834), AOM_ICDF(11977),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {21185, 28338, 32249, 32417, 32768 },
-        {18497, 25227, 31905, 32122, 32768 },
-        {12097, 16516, 28610, 29166, 32768 },
-        {9281, 11157, 21438, 22312, 32768 },
-        {5697, 6566, 15585, 16340, 32768 },
-        {9409, 9659, 11827, 12911, 32768 } },
+        {AOM_ICDF(21185), AOM_ICDF(28338), AOM_ICDF(32249), AOM_ICDF(32417),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(18497), AOM_ICDF(25227), AOM_ICDF(31905), AOM_ICDF(32122),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12097), AOM_ICDF(16516), AOM_ICDF(28610), AOM_ICDF(29166),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9281), AOM_ICDF(11157), AOM_ICDF(21438), AOM_ICDF(22312),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5697), AOM_ICDF(6566), AOM_ICDF(15585), AOM_ICDF(16340),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9409), AOM_ICDF(9659), AOM_ICDF(11827), AOM_ICDF(12911),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {22337, 29459, 32382, 32519, 32768 },
-        {16961, 25262, 31874, 32123, 32768 },
-        {12353, 17748, 29300, 29852, 32768 },
-        {9025, 11528, 24468, 25141, 32768 },
-        {6209, 6565, 15806, 16121, 32768 },
-        {2497, 2524, 7050, 7125, 32768 } },
+        {AOM_ICDF(22337), AOM_ICDF(29459), AOM_ICDF(32382), AOM_ICDF(32519),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16961), AOM_ICDF(25262), AOM_ICDF(31874), AOM_ICDF(32123),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12353), AOM_ICDF(17748), AOM_ICDF(29300), AOM_ICDF(29852),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9025), AOM_ICDF(11528), AOM_ICDF(24468), AOM_ICDF(25141),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6209), AOM_ICDF(6565), AOM_ICDF(15806), AOM_ICDF(16121),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2497), AOM_ICDF(2524), AOM_ICDF(7050), AOM_ICDF(7125),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {20417, 29779, 32552, 32636, 32768 },
-        {15553, 26420, 32063, 32295, 32768 },
-        {9665, 17946, 29385, 30096, 32768 },
-        {5569, 10207, 22410, 23836, 32768 },
-        {16449, 16450, 16545, 16593, 32768 },
-        {2369, 2395, 6822, 6898, 32768 } },
+        {AOM_ICDF(20417), AOM_ICDF(29779), AOM_ICDF(32552), AOM_ICDF(32636),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15553), AOM_ICDF(26420), AOM_ICDF(32063), AOM_ICDF(32295),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9665), AOM_ICDF(17946), AOM_ICDF(29385), AOM_ICDF(30096),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5569), AOM_ICDF(10207), AOM_ICDF(22410), AOM_ICDF(23836),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16449), AOM_ICDF(16450), AOM_ICDF(16545), AOM_ICDF(16593),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2369), AOM_ICDF(2395), AOM_ICDF(6822), AOM_ICDF(6898),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {10177, 30567, 32725, 32745, 32768 },
-        {9537, 28243, 32179, 32423, 32768 },
-        {13377, 23187, 29322, 30382, 32768 },
-        {13121, 21346, 29507, 30326, 32768 },
-        {4417, 4939, 15104, 15535, 32768 },
-        {2625, 2680, 8218, 8338, 32768 } } },
+        {AOM_ICDF(10177), AOM_ICDF(30567), AOM_ICDF(32725), AOM_ICDF(32745),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9537), AOM_ICDF(28243), AOM_ICDF(32179), AOM_ICDF(32423),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(13377), AOM_ICDF(23187), AOM_ICDF(29322), AOM_ICDF(30382),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(13121), AOM_ICDF(21346), AOM_ICDF(29507), AOM_ICDF(30326),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4417), AOM_ICDF(4939), AOM_ICDF(15104), AOM_ICDF(15535),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2625), AOM_ICDF(2680), AOM_ICDF(8218), AOM_ICDF(8338),
+         AOM_ICDF(32768) } } },
     {   // Inter
       { // Band 0
-        { 29376, 30098, 32421, 32766, 32767, 32768 },
-        { 18368, 22916, 30116, 32541, 32650, 32768 },
-        { 5952, 16505, 25955, 32163, 32365, 32768 } },
+        { AOM_ICDF(29376), AOM_ICDF(30098), AOM_ICDF(32421), AOM_ICDF(32766),
+          AOM_ICDF(32767), AOM_ICDF(32768) },
+        { AOM_ICDF(18368), AOM_ICDF(22916), AOM_ICDF(30116), AOM_ICDF(32541),
+          AOM_ICDF(32650), AOM_ICDF(32768) },
+        { AOM_ICDF(5952), AOM_ICDF(16505), AOM_ICDF(25955), AOM_ICDF(32163),
+          AOM_ICDF(32365), AOM_ICDF(32768) } },
       { // Band 1
-        {19649, 30160, 32743, 32753, 32768 },
-        {18881, 28724, 32688, 32717, 32768 },
-        {16833, 23053, 31244, 31573, 32768 },
-        {14657, 17714, 26083, 26978, 32768 },
-        {14657, 16618, 24597, 25403, 32768 },
-        {4289, 4326, 10686, 10751, 32768 } },
+        {AOM_ICDF(19649), AOM_ICDF(30160), AOM_ICDF(32743), AOM_ICDF(32753),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(18881), AOM_ICDF(28724), AOM_ICDF(32688), AOM_ICDF(32717),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16833), AOM_ICDF(23053), AOM_ICDF(31244), AOM_ICDF(31573),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(14657), AOM_ICDF(17714), AOM_ICDF(26083), AOM_ICDF(26978),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(14657), AOM_ICDF(16618), AOM_ICDF(24597), AOM_ICDF(25403),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4289), AOM_ICDF(4326), AOM_ICDF(10686), AOM_ICDF(10751),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {21953, 30956, 32748, 32757, 32768 },
-        {20929, 29412, 32700, 32725, 32768 },
-        {13377, 21495, 31216, 31569, 32768 },
-        {9153, 15097, 28295, 28990, 32768 },
-        {5313, 5363, 13839, 13894, 32768 },
-        {2625, 2652, 7276, 7351, 32768 } },
+        {AOM_ICDF(21953), AOM_ICDF(30956), AOM_ICDF(32748), AOM_ICDF(32757),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(20929), AOM_ICDF(29412), AOM_ICDF(32700), AOM_ICDF(32725),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(13377), AOM_ICDF(21495), AOM_ICDF(31216), AOM_ICDF(31569),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9153), AOM_ICDF(15097), AOM_ICDF(28295), AOM_ICDF(28990),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5313), AOM_ICDF(5363), AOM_ICDF(13839), AOM_ICDF(13894),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2625), AOM_ICDF(2652), AOM_ICDF(7276), AOM_ICDF(7351),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {20289, 31164, 32745, 32755, 32768 },
-        {17601, 29635, 32739, 32751, 32768 },
-        {18241, 24284, 32116, 32258, 32768 },
-        {32705, 32706, 32739, 32740, 32768 },
-        {5697, 5750, 14739, 14792, 32768 },
-        {2881, 2913, 8427, 8498, 32768 } },
+        {AOM_ICDF(20289), AOM_ICDF(31164), AOM_ICDF(32745), AOM_ICDF(32755),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(17601), AOM_ICDF(29635), AOM_ICDF(32739), AOM_ICDF(32751),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(18241), AOM_ICDF(24284), AOM_ICDF(32116), AOM_ICDF(32258),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(32705), AOM_ICDF(32706), AOM_ICDF(32739), AOM_ICDF(32740),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5697), AOM_ICDF(5750), AOM_ICDF(14739), AOM_ICDF(14792),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2881), AOM_ICDF(2913), AOM_ICDF(8427), AOM_ICDF(8498),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {19009, 31481, 32742, 32754, 32768 },
-        {15809, 30521, 32736, 32750, 32768 },
-        {16449, 32705, 32737, 32753, 32768 },
-        {7873, 8039, 19981, 20068, 32768 },
-        {5313, 5366, 14376, 14430, 32768 },
-        {2753, 2789, 8909, 8979, 32768 } },
+        {AOM_ICDF(19009), AOM_ICDF(31481), AOM_ICDF(32742), AOM_ICDF(32754),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15809), AOM_ICDF(30521), AOM_ICDF(32736), AOM_ICDF(32750),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16449), AOM_ICDF(32705), AOM_ICDF(32737), AOM_ICDF(32753),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7873), AOM_ICDF(8039), AOM_ICDF(19981), AOM_ICDF(20068),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5313), AOM_ICDF(5366), AOM_ICDF(14376), AOM_ICDF(14430),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2753), AOM_ICDF(2789), AOM_ICDF(8909), AOM_ICDF(8979),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {11841, 32116, 32728, 32748, 32768 },
-        {12353, 32132, 32729, 32748, 32768 },
-        {7489, 12435, 25708, 26666, 32768 },
-        {5697, 7486, 20238, 21009, 32768 },
-        {4929, 5579, 16402, 16866, 32768 },
-        {3009, 3246, 10158, 10533, 32768 } } } }
+        {AOM_ICDF(11841), AOM_ICDF(32116), AOM_ICDF(32728), AOM_ICDF(32748),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12353), AOM_ICDF(32132), AOM_ICDF(32729), AOM_ICDF(32748),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7489), AOM_ICDF(12435), AOM_ICDF(25708), AOM_ICDF(26666),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5697), AOM_ICDF(7486), AOM_ICDF(20238), AOM_ICDF(21009),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4929), AOM_ICDF(5579), AOM_ICDF(16402), AOM_ICDF(16866),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3009), AOM_ICDF(3246), AOM_ICDF(10158), AOM_ICDF(10533),
+         AOM_ICDF(32768) } } } }
 };
 static const coeff_cdf_model default_coef_head_cdf_8x8[PLANE_TYPES] = {
   {     // Y plane
     {   // Intra
       { // Band 0
-        { 16064, 18127, 22153, 27289, 28507, 32768 },
-        { 6720, 10545, 13491, 20948, 22631, 32768 },
-        { 832, 5270, 5918, 12645, 13532, 32768 } },
+        { AOM_ICDF(16064), AOM_ICDF(18127), AOM_ICDF(22153), AOM_ICDF(27289),
+          AOM_ICDF(28507), AOM_ICDF(32768) },
+        { AOM_ICDF(6720), AOM_ICDF(10545), AOM_ICDF(13491), AOM_ICDF(20948),
+          AOM_ICDF(22631), AOM_ICDF(32768) },
+        { AOM_ICDF(832), AOM_ICDF(5270), AOM_ICDF(5918), AOM_ICDF(12645),
+          AOM_ICDF(13532), AOM_ICDF(32768) } },
       { // Band 1
-        {14017, 16139, 26799, 27295, 32768 },
-        {12737, 15136, 26235, 26816, 32768 },
-        {10817, 12445, 23637, 24217, 32768 },
-        {8897, 9702, 20040, 20500, 32768 },
-        {5953, 6156, 13966, 14205, 32768 },
-        {2497, 2519, 6222, 6300, 32768 } },
+        {AOM_ICDF(14017), AOM_ICDF(16139), AOM_ICDF(26799), AOM_ICDF(27295),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12737), AOM_ICDF(15136), AOM_ICDF(26235), AOM_ICDF(26816),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10817), AOM_ICDF(12445), AOM_ICDF(23637), AOM_ICDF(24217),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(8897), AOM_ICDF(9702), AOM_ICDF(20040), AOM_ICDF(20500),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5953), AOM_ICDF(6156), AOM_ICDF(13966), AOM_ICDF(14205),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2497), AOM_ICDF(2519), AOM_ICDF(6222), AOM_ICDF(6300),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {19777, 21403, 30054, 30269, 32768 },
-        {16193, 17913, 28593, 28883, 32768 },
-        {12609, 13572, 25248, 25534, 32768 },
-        {9665, 10118, 20721, 20968, 32768 },
-        {6849, 7028, 15202, 15391, 32768 },
-        {3009, 3036, 7601, 7675, 32768 } },
+        {AOM_ICDF(19777), AOM_ICDF(21403), AOM_ICDF(30054), AOM_ICDF(30269),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16193), AOM_ICDF(17913), AOM_ICDF(28593), AOM_ICDF(28883),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12609), AOM_ICDF(13572), AOM_ICDF(25248), AOM_ICDF(25534),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9665), AOM_ICDF(10118), AOM_ICDF(20721), AOM_ICDF(20968),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6849), AOM_ICDF(7028), AOM_ICDF(15202), AOM_ICDF(15391),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3009), AOM_ICDF(3036), AOM_ICDF(7601), AOM_ICDF(7675),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {22593, 23915, 31159, 31283, 32768 },
-        {17345, 18690, 29425, 29611, 32768 },
-        {11969, 12540, 24685, 24867, 32768 },
-        {8129, 8355, 18668, 18819, 32768 },
-        {4673, 4714, 11752, 11814, 32768 },
-        {1857, 1876, 5057, 5138, 32768 } },
+        {AOM_ICDF(22593), AOM_ICDF(23915), AOM_ICDF(31159), AOM_ICDF(31283),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(17345), AOM_ICDF(18690), AOM_ICDF(29425), AOM_ICDF(29611),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11969), AOM_ICDF(12540), AOM_ICDF(24685), AOM_ICDF(24867),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(8129), AOM_ICDF(8355), AOM_ICDF(18668), AOM_ICDF(18819),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4673), AOM_ICDF(4714), AOM_ICDF(11752), AOM_ICDF(11814),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(1857), AOM_ICDF(1876), AOM_ICDF(5057), AOM_ICDF(5138),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {24513, 25718, 31947, 32014, 32768 },
-        {18881, 20029, 30409, 30527, 32768 },
-        {12481, 12953, 25201, 25341, 32768 },
-        {8385, 8528, 18815, 18910, 32768 },
-        {4289, 4327, 10797, 10861, 32768 },
-        {1857, 1872, 4332, 4415, 32768 } },
+        {AOM_ICDF(24513), AOM_ICDF(25718), AOM_ICDF(31947), AOM_ICDF(32014),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(18881), AOM_ICDF(20029), AOM_ICDF(30409), AOM_ICDF(30527),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12481), AOM_ICDF(12953), AOM_ICDF(25201), AOM_ICDF(25341),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(8385), AOM_ICDF(8528), AOM_ICDF(18815), AOM_ICDF(18910),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4289), AOM_ICDF(4327), AOM_ICDF(10797), AOM_ICDF(10861),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(1857), AOM_ICDF(1872), AOM_ICDF(4332), AOM_ICDF(4415),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {26049, 27752, 32415, 32462, 32768 },
-        {20417, 22100, 31056, 31192, 32768 },
-        {12481, 13075, 24646, 24844, 32768 },
-        {7489, 7696, 17117, 17285, 32768 },
-        {3777, 3814, 10062, 10129, 32768 },
-        {1473, 1486, 3735, 3820, 32768 } } },
+        {AOM_ICDF(26049), AOM_ICDF(27752), AOM_ICDF(32415), AOM_ICDF(32462),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(20417), AOM_ICDF(22100), AOM_ICDF(31056), AOM_ICDF(31192),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12481), AOM_ICDF(13075), AOM_ICDF(24646), AOM_ICDF(24844),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7489), AOM_ICDF(7696), AOM_ICDF(17117), AOM_ICDF(17285),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3777), AOM_ICDF(3814), AOM_ICDF(10062), AOM_ICDF(10129),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(1473), AOM_ICDF(1486), AOM_ICDF(3735), AOM_ICDF(3820),
+         AOM_ICDF(32768) } } },
     {   // Intra
       { // Band 0
-        { 25920, 27743, 29455, 32147, 32280, 32768 },
-        { 13888, 19845, 23350, 30219, 30660, 32768 },
-        { 2368, 12781, 16196, 27232, 27894, 32768 } },
+        { AOM_ICDF(25920), AOM_ICDF(27743), AOM_ICDF(29455), AOM_ICDF(32147),
+          AOM_ICDF(32280), AOM_ICDF(32768) },
+        { AOM_ICDF(13888), AOM_ICDF(19845), AOM_ICDF(23350), AOM_ICDF(30219),
+          AOM_ICDF(30660), AOM_ICDF(32768) },
+        { AOM_ICDF(2368), AOM_ICDF(12781), AOM_ICDF(16196), AOM_ICDF(27232),
+          AOM_ICDF(27894), AOM_ICDF(32768) } },
       { // Band 1
-        {21697, 24758, 32358, 32417, 32768 },
-        {20289, 23960, 32111, 32213, 32768 },
-        {17345, 19966, 30630, 30841, 32768 },
-        {14529, 16070, 27461, 27777, 32768 },
-        {9793, 10613, 21146, 21566, 32768 },
-        {6977, 7162, 15591, 15776, 32768 } },
+        {AOM_ICDF(21697), AOM_ICDF(24758), AOM_ICDF(32358), AOM_ICDF(32417),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(20289), AOM_ICDF(23960), AOM_ICDF(32111), AOM_ICDF(32213),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(17345), AOM_ICDF(19966), AOM_ICDF(30630), AOM_ICDF(30841),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(14529), AOM_ICDF(16070), AOM_ICDF(27461), AOM_ICDF(27777),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9793), AOM_ICDF(10613), AOM_ICDF(21146), AOM_ICDF(21566),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6977), AOM_ICDF(7162), AOM_ICDF(15591), AOM_ICDF(15776),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {23617, 26783, 32572, 32607, 32768 },
-        {20801, 24292, 32185, 32275, 32768 },
-        {15169, 17905, 29916, 30181, 32768 },
-        {10945, 12972, 25565, 26064, 32768 },
-        {6849, 8334, 18543, 19446, 32768 },
-        {3649, 4346, 12351, 13169, 32768 } },
+        {AOM_ICDF(23617), AOM_ICDF(26783), AOM_ICDF(32572), AOM_ICDF(32607),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(20801), AOM_ICDF(24292), AOM_ICDF(32185), AOM_ICDF(32275),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15169), AOM_ICDF(17905), AOM_ICDF(29916), AOM_ICDF(30181),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10945), AOM_ICDF(12972), AOM_ICDF(25565), AOM_ICDF(26064),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6849), AOM_ICDF(8334), AOM_ICDF(18543), AOM_ICDF(19446),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3649), AOM_ICDF(4346), AOM_ICDF(12351), AOM_ICDF(13169),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {25281, 28440, 32667, 32689, 32768 },
-        {22081, 25694, 32414, 32476, 32768 },
-        {15297, 18341, 30141, 30410, 32768 },
-        {10305, 12381, 24477, 25084, 32768 },
-        {5697, 6673, 16325, 17080, 32768 },
-        {2369, 2393, 6466, 6543, 32768 } },
+        {AOM_ICDF(25281), AOM_ICDF(28440), AOM_ICDF(32667), AOM_ICDF(32689),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(22081), AOM_ICDF(25694), AOM_ICDF(32414), AOM_ICDF(32476),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15297), AOM_ICDF(18341), AOM_ICDF(30141), AOM_ICDF(30410),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10305), AOM_ICDF(12381), AOM_ICDF(24477), AOM_ICDF(25084),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5697), AOM_ICDF(6673), AOM_ICDF(16325), AOM_ICDF(17080),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2369), AOM_ICDF(2393), AOM_ICDF(6466), AOM_ICDF(6543),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {25921, 29445, 32729, 32739, 32768 },
-        {22465, 26834, 32588, 32627, 32768 },
-        {16449, 20062, 31016, 31233, 32768 },
-        {11073, 13165, 25353, 25896, 32768 },
-        {11713, 13837, 20144, 21734, 32768 },
-        {2241, 2265, 6355, 6432, 32768 } },
+        {AOM_ICDF(25921), AOM_ICDF(29445), AOM_ICDF(32729), AOM_ICDF(32739),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(22465), AOM_ICDF(26834), AOM_ICDF(32588), AOM_ICDF(32627),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16449), AOM_ICDF(20062), AOM_ICDF(31016), AOM_ICDF(31233),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11073), AOM_ICDF(13165), AOM_ICDF(25353), AOM_ICDF(25896),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11713), AOM_ICDF(13837), AOM_ICDF(20144), AOM_ICDF(21734),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2241), AOM_ICDF(2265), AOM_ICDF(6355), AOM_ICDF(6432),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {26177, 29403, 32705, 32721, 32768 },
-        {22337, 26344, 32545, 32589, 32768 },
-        {19009, 21527, 31775, 31873, 32768 },
-        {11585, 12685, 22632, 23137, 32768 },
-        {8257, 8305, 16444, 16492, 32768 },
-        {2113, 2183, 7202, 7377, 32768 } } } },
+        {AOM_ICDF(26177), AOM_ICDF(29403), AOM_ICDF(32705), AOM_ICDF(32721),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(22337), AOM_ICDF(26344), AOM_ICDF(32545), AOM_ICDF(32589),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(19009), AOM_ICDF(21527), AOM_ICDF(31775), AOM_ICDF(31873),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11585), AOM_ICDF(12685), AOM_ICDF(22632), AOM_ICDF(23137),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(8257), AOM_ICDF(8305), AOM_ICDF(16444), AOM_ICDF(16492),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2113), AOM_ICDF(2183), AOM_ICDF(7202), AOM_ICDF(7377),
+         AOM_ICDF(32768) } } } },
   {     // UV plane
     {   // Inter
       { // Band 0
-        { 27200, 27981, 31389, 32444, 32592, 32768 },
-        { 14528, 19068, 24887, 29901, 30688, 32768 },
-        { 3776, 11778, 14700, 23745, 24854, 32768 } },
+        { AOM_ICDF(27200), AOM_ICDF(27981), AOM_ICDF(31389), AOM_ICDF(32444),
+          AOM_ICDF(32592), AOM_ICDF(32768) },
+        { AOM_ICDF(14528), AOM_ICDF(19068), AOM_ICDF(24887), AOM_ICDF(29901),
+          AOM_ICDF(30688), AOM_ICDF(32768) },
+        { AOM_ICDF(3776), AOM_ICDF(11778), AOM_ICDF(14700), AOM_ICDF(23745),
+          AOM_ICDF(24854), AOM_ICDF(32768) } },
       { // Band 1
-        {20289, 25202, 31672, 31909, 32768 },
-        {18369, 23493, 31166, 31487, 32768 },
-        {15425, 18619, 28941, 29393, 32768 },
-        {10945, 12535, 24287, 24792, 32768 },
-        {6465, 6810, 15764, 16080, 32768 },
-        {2113, 2137, 6125, 6203, 32768 } },
+        {AOM_ICDF(20289), AOM_ICDF(25202), AOM_ICDF(31672), AOM_ICDF(31909),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(18369), AOM_ICDF(23493), AOM_ICDF(31166), AOM_ICDF(31487),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15425), AOM_ICDF(18619), AOM_ICDF(28941), AOM_ICDF(29393),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10945), AOM_ICDF(12535), AOM_ICDF(24287), AOM_ICDF(24792),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6465), AOM_ICDF(6810), AOM_ICDF(15764), AOM_ICDF(16080),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2113), AOM_ICDF(2137), AOM_ICDF(6125), AOM_ICDF(6203),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {23745, 27041, 31976, 32135, 32768 },
-        {19521, 22766, 31139, 31367, 32768 },
-        {14273, 15834, 27820, 28105, 32768 },
-        {9537, 10445, 22106, 22491, 32768 },
-        {7233, 7386, 15961, 16109, 32768 },
-        {2369, 2401, 7891, 7964, 32768 } },
+        {AOM_ICDF(23745), AOM_ICDF(27041), AOM_ICDF(31976), AOM_ICDF(32135),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(19521), AOM_ICDF(22766), AOM_ICDF(31139), AOM_ICDF(31367),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(14273), AOM_ICDF(15834), AOM_ICDF(27820), AOM_ICDF(28105),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9537), AOM_ICDF(10445), AOM_ICDF(22106), AOM_ICDF(22491),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7233), AOM_ICDF(7386), AOM_ICDF(15961), AOM_ICDF(16109),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2369), AOM_ICDF(2401), AOM_ICDF(7891), AOM_ICDF(7964),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {26305, 28703, 32352, 32435, 32768 },
-        {20673, 23490, 31517, 31680, 32768 },
-        {14017, 15251, 27458, 27702, 32768 },
-        {10945, 11374, 22496, 22687, 32768 },
-        {9153, 9435, 22299, 22411, 32768 },
-        {193, 269, 13236, 13293, 32768 } },
+        {AOM_ICDF(26305), AOM_ICDF(28703), AOM_ICDF(32352), AOM_ICDF(32435),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(20673), AOM_ICDF(23490), AOM_ICDF(31517), AOM_ICDF(31680),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(14017), AOM_ICDF(15251), AOM_ICDF(27458), AOM_ICDF(27702),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10945), AOM_ICDF(11374), AOM_ICDF(22496), AOM_ICDF(22687),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9153), AOM_ICDF(9435), AOM_ICDF(22299), AOM_ICDF(22411),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(269), AOM_ICDF(13236), AOM_ICDF(13293),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {27713, 29770, 32522, 32575, 32768 },
-        {21569, 24342, 31785, 31919, 32768 },
-        {15297, 16497, 28367, 28569, 32768 },
-        {17601, 17828, 24444, 24582, 32768 },
-        {6977, 7035, 16901, 16947, 32768 },
-        {193, 384, 32706, 32707, 32768 } },
+        {AOM_ICDF(27713), AOM_ICDF(29770), AOM_ICDF(32522), AOM_ICDF(32575),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(21569), AOM_ICDF(24342), AOM_ICDF(31785), AOM_ICDF(31919),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15297), AOM_ICDF(16497), AOM_ICDF(28367), AOM_ICDF(28569),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(17601), AOM_ICDF(17828), AOM_ICDF(24444), AOM_ICDF(24582),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6977), AOM_ICDF(7035), AOM_ICDF(16901), AOM_ICDF(16947),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(384), AOM_ICDF(32706), AOM_ICDF(32707),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {28737, 30879, 32667, 32695, 32768 },
-        {22593, 26241, 32073, 32207, 32768 },
-        {16577, 19148, 28436, 28906, 32768 },
-        {12993, 14005, 23151, 23630, 32768 },
-        {7617, 9188, 22797, 23313, 32768 },
-        {2625, 2680, 8218, 8338, 32768 } } },
+        {AOM_ICDF(28737), AOM_ICDF(30879), AOM_ICDF(32667), AOM_ICDF(32695),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(22593), AOM_ICDF(26241), AOM_ICDF(32073), AOM_ICDF(32207),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16577), AOM_ICDF(19148), AOM_ICDF(28436), AOM_ICDF(28906),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12993), AOM_ICDF(14005), AOM_ICDF(23151), AOM_ICDF(23630),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7617), AOM_ICDF(9188), AOM_ICDF(22797), AOM_ICDF(23313),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2625), AOM_ICDF(2680), AOM_ICDF(8218), AOM_ICDF(8338),
+         AOM_ICDF(32768) } } },
     {   // Inter
       { // Band 0
-        { 28864, 29988, 32423, 32766, 32767, 32768 },
-        { 18496, 24572, 30167, 32687, 32737, 32768 },
-        { 5440, 19618, 25332, 32393, 32491, 32768 } },
+        { AOM_ICDF(28864), AOM_ICDF(29988), AOM_ICDF(32423), AOM_ICDF(32766),
+          AOM_ICDF(32767), AOM_ICDF(32768) },
+        { AOM_ICDF(18496), AOM_ICDF(24572), AOM_ICDF(30167), AOM_ICDF(32687),
+          AOM_ICDF(32737), AOM_ICDF(32768) },
+        { AOM_ICDF(5440), AOM_ICDF(19618), AOM_ICDF(25332), AOM_ICDF(32393),
+          AOM_ICDF(32491), AOM_ICDF(32768) } },
       { // Band 1
-        {23745, 29427, 32751, 32757, 32768 },
-        {23745, 28704, 32716, 32731, 32768 },
-        {23105, 27943, 32524, 32587, 32768 },
-        {21057, 24773, 29589, 30282, 32768 },
-        {12609, 14823, 23831, 24713, 32768 },
-        {16449, 16450, 16545, 16593, 32768 } },
+        {AOM_ICDF(23745), AOM_ICDF(29427), AOM_ICDF(32751), AOM_ICDF(32757),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(23745), AOM_ICDF(28704), AOM_ICDF(32716), AOM_ICDF(32731),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(23105), AOM_ICDF(27943), AOM_ICDF(32524), AOM_ICDF(32587),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(21057), AOM_ICDF(24773), AOM_ICDF(29589), AOM_ICDF(30282),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12609), AOM_ICDF(14823), AOM_ICDF(23831), AOM_ICDF(24713),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16449), AOM_ICDF(16450), AOM_ICDF(16545), AOM_ICDF(16593),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {25025, 30203, 32754, 32759, 32768 },
-        {23617, 28361, 32715, 32729, 32768 },
-        {17985, 21562, 31354, 31543, 32768 },
-        {12353, 18915, 28742, 29548, 32768 },
-        {193, 289, 16545, 16593, 32768 },
-        {2625, 2652, 7276, 7351, 32768 } },
+        {AOM_ICDF(25025), AOM_ICDF(30203), AOM_ICDF(32754), AOM_ICDF(32759),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(23617), AOM_ICDF(28361), AOM_ICDF(32715), AOM_ICDF(32729),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(17985), AOM_ICDF(21562), AOM_ICDF(31354), AOM_ICDF(31543),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12353), AOM_ICDF(18915), AOM_ICDF(28742), AOM_ICDF(29548),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(289), AOM_ICDF(16545), AOM_ICDF(16593),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2625), AOM_ICDF(2652), AOM_ICDF(7276), AOM_ICDF(7351),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {26433, 30892, 32757, 32761, 32768 },
-        {24513, 29274, 32721, 32735, 32768 },
-        {20161, 24040, 32055, 32171, 32768 },
-        {21953, 24678, 27382, 28734, 32768 },
-        {5697, 5750, 14739, 14792, 32768 },
-        {2881, 2913, 8427, 8498, 32768 } },
+        {AOM_ICDF(26433), AOM_ICDF(30892), AOM_ICDF(32757), AOM_ICDF(32761),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(24513), AOM_ICDF(29274), AOM_ICDF(32721), AOM_ICDF(32735),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(20161), AOM_ICDF(24040), AOM_ICDF(32055), AOM_ICDF(32171),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(21953), AOM_ICDF(24678), AOM_ICDF(27382), AOM_ICDF(28734),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5697), AOM_ICDF(5750), AOM_ICDF(14739), AOM_ICDF(14792),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2881), AOM_ICDF(2913), AOM_ICDF(8427), AOM_ICDF(8498),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {27457, 31485, 32759, 32763, 32768 },
-        {24129, 29502, 32752, 32757, 32768 },
-        {19009, 25452, 32473, 32544, 32768 },
-        {32705, 32706, 32737, 32738, 32768 },
-        {5313, 5366, 14376, 14430, 32768 },
-        {2753, 2789, 8909, 8979, 32768 } },
+        {AOM_ICDF(27457), AOM_ICDF(31485), AOM_ICDF(32759), AOM_ICDF(32763),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(24129), AOM_ICDF(29502), AOM_ICDF(32752), AOM_ICDF(32757),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(19009), AOM_ICDF(25452), AOM_ICDF(32473), AOM_ICDF(32544),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(32705), AOM_ICDF(32706), AOM_ICDF(32737), AOM_ICDF(32738),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5313), AOM_ICDF(5366), AOM_ICDF(14376), AOM_ICDF(14430),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2753), AOM_ICDF(2789), AOM_ICDF(8909), AOM_ICDF(8979),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {27841, 32288, 32759, 32764, 32768 },
-        {19137, 30271, 32742, 32753, 32768 },
-        {18625, 27739, 29979, 31099, 32768 },
-        {5697, 7486, 20238, 21009, 32768 },
-        {4929, 5579, 16402, 16866, 32768 },
-        {3009, 3246, 10158, 10533, 32768 } } } }
+        {AOM_ICDF(27841), AOM_ICDF(32288), AOM_ICDF(32759), AOM_ICDF(32764),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(19137), AOM_ICDF(30271), AOM_ICDF(32742), AOM_ICDF(32753),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(18625), AOM_ICDF(27739), AOM_ICDF(29979), AOM_ICDF(31099),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5697), AOM_ICDF(7486), AOM_ICDF(20238), AOM_ICDF(21009),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4929), AOM_ICDF(5579), AOM_ICDF(16402), AOM_ICDF(16866),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3009), AOM_ICDF(3246), AOM_ICDF(10158), AOM_ICDF(10533),
+         AOM_ICDF(32768) } } } }
 };
 static const coeff_cdf_model default_coef_head_cdf_16x16[PLANE_TYPES] = {
   {     // Y plane
     {   // Intra
       { // Band 0
-        { 960, 4882, 9467, 17710, 20412, 32768 },
-        { 704, 4657, 6561, 14507, 16279, 32768 },
-        { 192, 3443, 3759, 9011, 9685, 32768 } },
+        { AOM_ICDF(960), AOM_ICDF(4882), AOM_ICDF(9467), AOM_ICDF(17710),
+          AOM_ICDF(20412), AOM_ICDF(32768) },
+        { AOM_ICDF(704), AOM_ICDF(4657), AOM_ICDF(6561), AOM_ICDF(14507),
+          AOM_ICDF(16279), AOM_ICDF(32768) },
+        { AOM_ICDF(192), AOM_ICDF(3443), AOM_ICDF(3759), AOM_ICDF(9011),
+          AOM_ICDF(9685), AOM_ICDF(32768) } },
       { // Band 1
-        {12481, 13958, 24487, 24997, 32768 },
-        {11457, 13075, 23820, 24406, 32768 },
-        {9793, 11127, 21775, 22387, 32768 },
-        {7745, 8457, 18155, 18655, 32768 },
-        {5441, 5668, 13180, 13467, 32768 },
-        {2497, 2520, 6340, 6417, 32768 } },
+        {AOM_ICDF(12481), AOM_ICDF(13958), AOM_ICDF(24487), AOM_ICDF(24997),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11457), AOM_ICDF(13075), AOM_ICDF(23820), AOM_ICDF(24406),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9793), AOM_ICDF(11127), AOM_ICDF(21775), AOM_ICDF(22387),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7745), AOM_ICDF(8457), AOM_ICDF(18155), AOM_ICDF(18655),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5441), AOM_ICDF(5668), AOM_ICDF(13180), AOM_ICDF(13467),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2497), AOM_ICDF(2520), AOM_ICDF(6340), AOM_ICDF(6417),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {19521, 20572, 28965, 29177, 32768 },
-        {15425, 16741, 27247, 27554, 32768 },
-        {11969, 12690, 23872, 24141, 32768 },
-        {9281, 9678, 19970, 20207, 32768 },
-        {6081, 6266, 14682, 14876, 32768 },
-        {2753, 2779, 7150, 7225, 32768 } },
+        {AOM_ICDF(19521), AOM_ICDF(20572), AOM_ICDF(28965), AOM_ICDF(29177),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15425), AOM_ICDF(16741), AOM_ICDF(27247), AOM_ICDF(27554),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11969), AOM_ICDF(12690), AOM_ICDF(23872), AOM_ICDF(24141),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9281), AOM_ICDF(9678), AOM_ICDF(19970), AOM_ICDF(20207),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6081), AOM_ICDF(6266), AOM_ICDF(14682), AOM_ICDF(14876),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2753), AOM_ICDF(2779), AOM_ICDF(7150), AOM_ICDF(7225),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {22337, 23293, 30630, 30753, 32768 },
-        {16321, 17427, 28368, 28570, 32768 },
-        {11457, 11907, 23570, 23741, 32768 },
-        {7233, 7331, 17258, 17334, 32768 },
-        {4033, 4070, 10375, 10441, 32768 },
-        {1601, 1619, 4706, 4788, 32768 } },
+        {AOM_ICDF(22337), AOM_ICDF(23293), AOM_ICDF(30630), AOM_ICDF(30753),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16321), AOM_ICDF(17427), AOM_ICDF(28368), AOM_ICDF(28570),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11457), AOM_ICDF(11907), AOM_ICDF(23570), AOM_ICDF(23741),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7233), AOM_ICDF(7331), AOM_ICDF(17258), AOM_ICDF(17334),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4033), AOM_ICDF(4070), AOM_ICDF(10375), AOM_ICDF(10441),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(1601), AOM_ICDF(1619), AOM_ICDF(4706), AOM_ICDF(4788),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {24769, 25536, 31660, 31722, 32768 },
-        {18113, 18886, 29420, 29534, 32768 },
-        {11201, 11412, 23207, 23291, 32768 },
-        {6977, 7033, 16599, 16646, 32768 },
-        {4033, 4070, 10375, 10441, 32768 },
-        {1601, 1620, 4827, 4909, 32768 } },
+        {AOM_ICDF(24769), AOM_ICDF(25536), AOM_ICDF(31660), AOM_ICDF(31722),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(18113), AOM_ICDF(18886), AOM_ICDF(29420), AOM_ICDF(29534),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11201), AOM_ICDF(11412), AOM_ICDF(23207), AOM_ICDF(23291),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6977), AOM_ICDF(7033), AOM_ICDF(16599), AOM_ICDF(16646),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4033), AOM_ICDF(4070), AOM_ICDF(10375), AOM_ICDF(10441),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(1601), AOM_ICDF(1620), AOM_ICDF(4827), AOM_ICDF(4909),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {28353, 28831, 32502, 32517, 32768 },
-        {21441, 21869, 30977, 31017, 32768 },
-        {11969, 12088, 24116, 24158, 32768 },
-        {7489, 7547, 17413, 17458, 32768 },
-        {4545, 4585, 11325, 11388, 32768 },
-        {2113, 2133, 5526, 5606, 32768 } } },
+        {AOM_ICDF(28353), AOM_ICDF(28831), AOM_ICDF(32502), AOM_ICDF(32517),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(21441), AOM_ICDF(21869), AOM_ICDF(30977), AOM_ICDF(31017),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11969), AOM_ICDF(12088), AOM_ICDF(24116), AOM_ICDF(24158),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7489), AOM_ICDF(7547), AOM_ICDF(17413), AOM_ICDF(17458),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4545), AOM_ICDF(4585), AOM_ICDF(11325), AOM_ICDF(11388),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2113), AOM_ICDF(2133), AOM_ICDF(5526), AOM_ICDF(5606),
+         AOM_ICDF(32768) } } },
     {   // Intra
       { // Band 0
-        { 2496, 8717, 17280, 28922, 29751, 32768 },
-        { 2496, 9665, 15235, 26542, 27580, 32768 },
-        { 448, 9240, 11886, 24124, 24898, 32768 } },
+        { AOM_ICDF(2496), AOM_ICDF(8717), AOM_ICDF(17280), AOM_ICDF(28922),
+          AOM_ICDF(29751), AOM_ICDF(32768) },
+        { AOM_ICDF(2496), AOM_ICDF(9665), AOM_ICDF(15235), AOM_ICDF(26542),
+          AOM_ICDF(27580), AOM_ICDF(32768) },
+        { AOM_ICDF(448), AOM_ICDF(9240), AOM_ICDF(11886), AOM_ICDF(24124),
+          AOM_ICDF(24898), AOM_ICDF(32768) } },
       { // Band 1
-        {21057, 22896, 31877, 31953, 32768 },
-        {20673, 23151, 31706, 31825, 32768 },
-        {18753, 20519, 30497, 30668, 32768 },
-        {15425, 16608, 27789, 28027, 32768 },
-        {10305, 10977, 21405, 21749, 32768 },
-        {3649, 3812, 11213, 11445, 32768 } },
+        {AOM_ICDF(21057), AOM_ICDF(22896), AOM_ICDF(31877), AOM_ICDF(31953),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(20673), AOM_ICDF(23151), AOM_ICDF(31706), AOM_ICDF(31825),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(18753), AOM_ICDF(20519), AOM_ICDF(30497), AOM_ICDF(30668),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15425), AOM_ICDF(16608), AOM_ICDF(27789), AOM_ICDF(28027),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10305), AOM_ICDF(10977), AOM_ICDF(21405), AOM_ICDF(21749),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3649), AOM_ICDF(3812), AOM_ICDF(11213), AOM_ICDF(11445),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {24001, 25899, 32307, 32360, 32768 },
-        {20929, 22941, 31775, 31867, 32768 },
-        {15169, 16734, 29228, 29425, 32768 },
-        {10561, 12047, 24918, 25324, 32768 },
-        {6977, 7929, 18311, 18918, 32768 },
-        {3649, 3760, 9962, 10162, 32768 } },
+        {AOM_ICDF(24001), AOM_ICDF(25899), AOM_ICDF(32307), AOM_ICDF(32360),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(20929), AOM_ICDF(22941), AOM_ICDF(31775), AOM_ICDF(31867),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15169), AOM_ICDF(16734), AOM_ICDF(29228), AOM_ICDF(29425),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10561), AOM_ICDF(12047), AOM_ICDF(24918), AOM_ICDF(25324),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6977), AOM_ICDF(7929), AOM_ICDF(18311), AOM_ICDF(18918),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3649), AOM_ICDF(3760), AOM_ICDF(9962), AOM_ICDF(10162),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {25793, 27526, 32565, 32591, 32768 },
-        {21825, 23885, 32064, 32135, 32768 },
-        {15041, 16286, 29203, 29360, 32768 },
-        {10433, 11058, 24349, 24538, 32768 },
-        {5569, 6016, 16460, 16794, 32768 },
-        {193, 194, 384, 479, 32768 } },
+        {AOM_ICDF(25793), AOM_ICDF(27526), AOM_ICDF(32565), AOM_ICDF(32591),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(21825), AOM_ICDF(23885), AOM_ICDF(32064), AOM_ICDF(32135),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15041), AOM_ICDF(16286), AOM_ICDF(29203), AOM_ICDF(29360),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10433), AOM_ICDF(11058), AOM_ICDF(24349), AOM_ICDF(24538),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5569), AOM_ICDF(6016), AOM_ICDF(16460), AOM_ICDF(16794),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(194), AOM_ICDF(384), AOM_ICDF(479),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {26433, 28398, 32682, 32696, 32768 },
-        {22977, 25086, 32367, 32412, 32768 },
-        {16577, 17928, 30144, 30275, 32768 },
-        {12481, 13352, 25993, 26211, 32768 },
-        {7745, 8069, 20501, 20657, 32768 },
-        {16449, 16450, 16545, 16593, 32768 } },
+        {AOM_ICDF(26433), AOM_ICDF(28398), AOM_ICDF(32682), AOM_ICDF(32696),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(22977), AOM_ICDF(25086), AOM_ICDF(32367), AOM_ICDF(32412),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16577), AOM_ICDF(17928), AOM_ICDF(30144), AOM_ICDF(30275),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12481), AOM_ICDF(13352), AOM_ICDF(25993), AOM_ICDF(26211),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7745), AOM_ICDF(8069), AOM_ICDF(20501), AOM_ICDF(20657),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16449), AOM_ICDF(16450), AOM_ICDF(16545), AOM_ICDF(16593),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {27841, 29700, 32721, 32730, 32768 },
-        {23873, 26202, 32578, 32604, 32768 },
-        {17729, 19046, 30448, 30568, 32768 },
-        {13505, 14508, 26034, 26304, 32768 },
-        {10049, 10494, 19945, 20233, 32768 },
-        {2113, 2183, 7202, 7377, 32768 } } } },
+        {AOM_ICDF(27841), AOM_ICDF(29700), AOM_ICDF(32721), AOM_ICDF(32730),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(23873), AOM_ICDF(26202), AOM_ICDF(32578), AOM_ICDF(32604),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(17729), AOM_ICDF(19046), AOM_ICDF(30448), AOM_ICDF(30568),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(13505), AOM_ICDF(14508), AOM_ICDF(26034), AOM_ICDF(26304),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10049), AOM_ICDF(10494), AOM_ICDF(19945), AOM_ICDF(20233),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2113), AOM_ICDF(2183), AOM_ICDF(7202), AOM_ICDF(7377),
+         AOM_ICDF(32768) } } } },
   {     // UV plane
     {   // Inter
       { // Band 0
-        { 27072, 27916, 31095, 32400, 32553, 32768 },
-        { 12352, 16792, 22516, 28853, 29797, 32768 },
-        { 2880, 9023, 11126, 20602, 21713, 32768 } },
+        { AOM_ICDF(27072), AOM_ICDF(27916), AOM_ICDF(31095), AOM_ICDF(32400),
+          AOM_ICDF(32553), AOM_ICDF(32768) },
+        { AOM_ICDF(12352), AOM_ICDF(16792), AOM_ICDF(22516), AOM_ICDF(28853),
+          AOM_ICDF(29797), AOM_ICDF(32768) },
+        { AOM_ICDF(2880), AOM_ICDF(9023), AOM_ICDF(11126), AOM_ICDF(20602),
+          AOM_ICDF(21713), AOM_ICDF(32768) } },
       { // Band 1
-        {20161, 24785, 31070, 31430, 32768 },
-        {17985, 22773, 30430, 30880, 32768 },
-        {15937, 18802, 28265, 28788, 32768 },
-        {11841, 13587, 24798, 25335, 32768 },
-        {8769, 9160, 19316, 19566, 32768 },
-        {5313, 5357, 12874, 12932, 32768 } },
+        {AOM_ICDF(20161), AOM_ICDF(24785), AOM_ICDF(31070), AOM_ICDF(31430),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(17985), AOM_ICDF(22773), AOM_ICDF(30430), AOM_ICDF(30880),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15937), AOM_ICDF(18802), AOM_ICDF(28265), AOM_ICDF(28788),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11841), AOM_ICDF(13587), AOM_ICDF(24798), AOM_ICDF(25335),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(8769), AOM_ICDF(9160), AOM_ICDF(19316), AOM_ICDF(19566),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5313), AOM_ICDF(5357), AOM_ICDF(12874), AOM_ICDF(12932),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {24129, 26501, 31672, 31844, 32768 },
-        {19649, 21553, 30130, 30370, 32768 },
-        {11713, 13134, 25983, 26321, 32768 },
-        {9409, 9948, 21408, 21663, 32768 },
-        {5569, 5757, 14335, 14533, 32768 },
-        {2241, 2305, 13152, 13209, 32768 } },
+        {AOM_ICDF(24129), AOM_ICDF(26501), AOM_ICDF(31672), AOM_ICDF(31844),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(19649), AOM_ICDF(21553), AOM_ICDF(30130), AOM_ICDF(30370),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11713), AOM_ICDF(13134), AOM_ICDF(25983), AOM_ICDF(26321),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9409), AOM_ICDF(9948), AOM_ICDF(21408), AOM_ICDF(21663),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5569), AOM_ICDF(5757), AOM_ICDF(14335), AOM_ICDF(14533),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2241), AOM_ICDF(2305), AOM_ICDF(13152), AOM_ICDF(13209),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {26817, 28135, 32130, 32209, 32768 },
-        {20161, 21412, 30331, 30481, 32768 },
-        {13377, 13798, 26065, 26176, 32768 },
-        {8129, 8290, 19920, 20008, 32768 },
-        {5697, 5751, 14950, 15002, 32768 },
-        {5569, 5601, 11041, 11105, 32768 } },
+        {AOM_ICDF(26817), AOM_ICDF(28135), AOM_ICDF(32130), AOM_ICDF(32209),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(20161), AOM_ICDF(21412), AOM_ICDF(30331), AOM_ICDF(30481),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(13377), AOM_ICDF(13798), AOM_ICDF(26065), AOM_ICDF(26176),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(8129), AOM_ICDF(8290), AOM_ICDF(19920), AOM_ICDF(20008),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5697), AOM_ICDF(5751), AOM_ICDF(14950), AOM_ICDF(15002),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5569), AOM_ICDF(5601), AOM_ICDF(11041), AOM_ICDF(11105),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {28225, 29079, 32387, 32426, 32768 },
-        {21185, 22046, 30982, 31061, 32768 },
-        {13377, 13595, 25762, 25824, 32768 },
-        {8001, 8123, 20530, 20590, 32768 },
-        {4289, 4322, 9907, 9974, 32768 },
-        {3393, 3412, 6663, 6739, 32768 } },
+        {AOM_ICDF(28225), AOM_ICDF(29079), AOM_ICDF(32387), AOM_ICDF(32426),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(21185), AOM_ICDF(22046), AOM_ICDF(30982), AOM_ICDF(31061),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(13377), AOM_ICDF(13595), AOM_ICDF(25762), AOM_ICDF(25824),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(8001), AOM_ICDF(8123), AOM_ICDF(20530), AOM_ICDF(20590),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4289), AOM_ICDF(4322), AOM_ICDF(9907), AOM_ICDF(9974),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3393), AOM_ICDF(3412), AOM_ICDF(6663), AOM_ICDF(6739),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {30529, 31014, 32651, 32664, 32768 },
-        {23489, 24268, 31627, 31682, 32768 },
-        {14017, 14239, 26653, 26707, 32768 },
-        {11201, 11317, 23122, 23169, 32768 },
-        {6721, 6768, 14810, 14863, 32768 },
-        {6593, 6632, 13188, 13245, 32768 } } },
+        {AOM_ICDF(30529), AOM_ICDF(31014), AOM_ICDF(32651), AOM_ICDF(32664),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(23489), AOM_ICDF(24268), AOM_ICDF(31627), AOM_ICDF(31682),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(14017), AOM_ICDF(14239), AOM_ICDF(26653), AOM_ICDF(26707),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11201), AOM_ICDF(11317), AOM_ICDF(23122), AOM_ICDF(23169),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6721), AOM_ICDF(6768), AOM_ICDF(14810), AOM_ICDF(14863),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6593), AOM_ICDF(6632), AOM_ICDF(13188), AOM_ICDF(13245),
+         AOM_ICDF(32768) } } },
     {   // Inter
       { // Band 0
-        { 29888, 30492, 32500, 32766, 32767, 32768 },
-        { 18752, 23235, 29846, 32214, 32442, 32768 },
-        { 5568, 17762, 25039, 31213, 31651, 32768 } },
+        { AOM_ICDF(29888), AOM_ICDF(30492), AOM_ICDF(32500), AOM_ICDF(32766),
+          AOM_ICDF(32767), AOM_ICDF(32768) },
+        { AOM_ICDF(18752), AOM_ICDF(23235), AOM_ICDF(29846), AOM_ICDF(32214),
+          AOM_ICDF(32442), AOM_ICDF(32768) },
+        { AOM_ICDF(5568), AOM_ICDF(17762), AOM_ICDF(25039), AOM_ICDF(31213),
+          AOM_ICDF(31651), AOM_ICDF(32768) } },
       { // Band 1
-        {26433, 29681, 32757, 32760, 32768 },
-        {24769, 28761, 32722, 32734, 32768 },
-        {22209, 26975, 32418, 32500, 32768 },
-        {16321, 21333, 28368, 29283, 32768 },
-        {12865, 14775, 22545, 23553, 32768 },
-        {12353, 12354, 12473, 12532, 32768 } },
+        {AOM_ICDF(26433), AOM_ICDF(29681), AOM_ICDF(32757), AOM_ICDF(32760),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(24769), AOM_ICDF(28761), AOM_ICDF(32722), AOM_ICDF(32734),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(22209), AOM_ICDF(26975), AOM_ICDF(32418), AOM_ICDF(32500),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16321), AOM_ICDF(21333), AOM_ICDF(28368), AOM_ICDF(29283),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12865), AOM_ICDF(14775), AOM_ICDF(22545), AOM_ICDF(23553),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12353), AOM_ICDF(12354), AOM_ICDF(12473), AOM_ICDF(12532),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {27457, 30005, 32738, 32745, 32768 },
-        {24897, 27541, 32723, 32731, 32768 },
-        {15297, 19106, 30414, 30711, 32768 },
-        {6593, 8826, 19732, 20840, 32768 },
-        {4161, 4233, 16509, 16557, 32768 },
-        {2625, 2652, 7276, 7351, 32768 } },
+        {AOM_ICDF(27457), AOM_ICDF(30005), AOM_ICDF(32738), AOM_ICDF(32745),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(24897), AOM_ICDF(27541), AOM_ICDF(32723), AOM_ICDF(32731),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15297), AOM_ICDF(19106), AOM_ICDF(30414), AOM_ICDF(30711),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6593), AOM_ICDF(8826), AOM_ICDF(19732), AOM_ICDF(20840),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4161), AOM_ICDF(4233), AOM_ICDF(16509), AOM_ICDF(16557),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2625), AOM_ICDF(2652), AOM_ICDF(7276), AOM_ICDF(7351),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {28609, 30482, 32761, 32763, 32768 },
-        {25665, 27830, 32727, 32733, 32768 },
-        {21057, 23803, 30367, 30721, 32768 },
-        {10945, 21878, 32726, 32737, 32768 },
-        {5697, 5750, 14739, 14792, 32768 },
-        {2881, 2913, 8427, 8498, 32768 } },
+        {AOM_ICDF(28609), AOM_ICDF(30482), AOM_ICDF(32761), AOM_ICDF(32763),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(25665), AOM_ICDF(27830), AOM_ICDF(32727), AOM_ICDF(32733),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(21057), AOM_ICDF(23803), AOM_ICDF(30367), AOM_ICDF(30721),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10945), AOM_ICDF(21878), AOM_ICDF(32726), AOM_ICDF(32737),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5697), AOM_ICDF(5750), AOM_ICDF(14739), AOM_ICDF(14792),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2881), AOM_ICDF(2913), AOM_ICDF(8427), AOM_ICDF(8498),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {28993, 30944, 32762, 32764, 32768 },
-        {26561, 28695, 32733, 32739, 32768 },
-        {17985, 19028, 31008, 31079, 32768 },
-        {7873, 8039, 19981, 20068, 32768 },
-        {5313, 5366, 14376, 14430, 32768 },
-        {2753, 2789, 8909, 8979, 32768 } },
+        {AOM_ICDF(28993), AOM_ICDF(30944), AOM_ICDF(32762), AOM_ICDF(32764),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(26561), AOM_ICDF(28695), AOM_ICDF(32733), AOM_ICDF(32739),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(17985), AOM_ICDF(19028), AOM_ICDF(31008), AOM_ICDF(31079),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7873), AOM_ICDF(8039), AOM_ICDF(19981), AOM_ICDF(20068),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5313), AOM_ICDF(5366), AOM_ICDF(14376), AOM_ICDF(14430),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2753), AOM_ICDF(2789), AOM_ICDF(8909), AOM_ICDF(8979),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {30273, 32029, 32764, 32766, 32768 },
-        {28609, 30847, 32745, 32751, 32768 },
-        {21313, 24377, 31986, 32098, 32768 },
-        {32705, 32709, 32739, 32741, 32768 },
-        {4929, 5579, 16402, 16866, 32768 },
-        {3009, 3246, 10158, 10533, 32768 } } } }
+        {AOM_ICDF(30273), AOM_ICDF(32029), AOM_ICDF(32764), AOM_ICDF(32766),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(28609), AOM_ICDF(30847), AOM_ICDF(32745), AOM_ICDF(32751),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(21313), AOM_ICDF(24377), AOM_ICDF(31986), AOM_ICDF(32098),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(32705), AOM_ICDF(32709), AOM_ICDF(32739), AOM_ICDF(32741),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4929), AOM_ICDF(5579), AOM_ICDF(16402), AOM_ICDF(16866),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3009), AOM_ICDF(3246), AOM_ICDF(10158), AOM_ICDF(10533),
+         AOM_ICDF(32768) } } } }
 };
 static const coeff_cdf_model default_coef_head_cdf_32x32[PLANE_TYPES] = {
   {     // Y plane
     {   // Intra
       { // Band 0
-        { 2240, 5407, 18304, 25601, 27911, 32768 },
-        { 960, 4633, 8197, 16254, 18796, 32768 },
-        { 192, 3061, 3557, 8701, 9762, 32768 } },
+        { AOM_ICDF(2240), AOM_ICDF(5407), AOM_ICDF(18304), AOM_ICDF(25601),
+          AOM_ICDF(27911), AOM_ICDF(32768) },
+        { AOM_ICDF(960), AOM_ICDF(4633), AOM_ICDF(8197), AOM_ICDF(16254),
+          AOM_ICDF(18796), AOM_ICDF(32768) },
+        { AOM_ICDF(192), AOM_ICDF(3061), AOM_ICDF(3557), AOM_ICDF(8701),
+          AOM_ICDF(9762), AOM_ICDF(32768) } },
       { // Band 1
-        {11969, 15846, 25660, 26667, 32768 },
-        {11713, 15794, 25737, 26760, 32768 },
-        {9281, 12675, 23181, 24351, 32768 },
-        {7105, 8757, 18383, 19437, 32768 },
-        {4289, 4579, 11353, 11792, 32768 },
-        {1857, 1874, 4695, 4777, 32768 } },
+        {AOM_ICDF(11969), AOM_ICDF(15846), AOM_ICDF(25660), AOM_ICDF(26667),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11713), AOM_ICDF(15794), AOM_ICDF(25737), AOM_ICDF(26760),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9281), AOM_ICDF(12675), AOM_ICDF(23181), AOM_ICDF(24351),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7105), AOM_ICDF(8757), AOM_ICDF(18383), AOM_ICDF(19437),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4289), AOM_ICDF(4579), AOM_ICDF(11353), AOM_ICDF(11792),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(1857), AOM_ICDF(1874), AOM_ICDF(4695), AOM_ICDF(4777),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {20929, 22297, 29370, 29646, 32768 },
-        {17473, 18985, 28079, 28413, 32768 },
-        {13121, 14064, 24902, 25217, 32768 },
-        {9793, 10214, 20069, 20329, 32768 },
-        {5825, 5987, 13350, 13559, 32768 },
-        {2241, 2260, 5520, 5600, 32768 } },
+        {AOM_ICDF(20929), AOM_ICDF(22297), AOM_ICDF(29370), AOM_ICDF(29646),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(17473), AOM_ICDF(18985), AOM_ICDF(28079), AOM_ICDF(28413),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(13121), AOM_ICDF(14064), AOM_ICDF(24902), AOM_ICDF(25217),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9793), AOM_ICDF(10214), AOM_ICDF(20069), AOM_ICDF(20329),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5825), AOM_ICDF(5987), AOM_ICDF(13350), AOM_ICDF(13559),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2241), AOM_ICDF(2260), AOM_ICDF(5520), AOM_ICDF(5600),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {25921, 26891, 31632, 31729, 32768 },
-        {18241, 19463, 29222, 29419, 32768 },
-        {11585, 12065, 23294, 23488, 32768 },
-        {6593, 6686, 16153, 16234, 32768 },
-        {3137, 3170, 8751, 8821, 32768 },
-        {1345, 1359, 3739, 3824, 32768 } },
+        {AOM_ICDF(25921), AOM_ICDF(26891), AOM_ICDF(31632), AOM_ICDF(31729),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(18241), AOM_ICDF(19463), AOM_ICDF(29222), AOM_ICDF(29419),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11585), AOM_ICDF(12065), AOM_ICDF(23294), AOM_ICDF(23488),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6593), AOM_ICDF(6686), AOM_ICDF(16153), AOM_ICDF(16234),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3137), AOM_ICDF(3170), AOM_ICDF(8751), AOM_ICDF(8821),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(1345), AOM_ICDF(1359), AOM_ICDF(3739), AOM_ICDF(3824),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {27713, 28504, 32068, 32132, 32768 },
-        {19265, 20354, 29789, 29943, 32768 },
-        {11201, 11538, 22701, 22848, 32768 },
-        {6337, 6424, 15268, 15353, 32768 },
-        {3649, 3681, 9052, 9121, 32768 },
-        {1601, 1618, 4584, 4667, 32768 } },
+        {AOM_ICDF(27713), AOM_ICDF(28504), AOM_ICDF(32068), AOM_ICDF(32132),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(19265), AOM_ICDF(20354), AOM_ICDF(29789), AOM_ICDF(29943),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11201), AOM_ICDF(11538), AOM_ICDF(22701), AOM_ICDF(22848),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6337), AOM_ICDF(6424), AOM_ICDF(15268), AOM_ICDF(15353),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3649), AOM_ICDF(3681), AOM_ICDF(9052), AOM_ICDF(9121),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(1601), AOM_ICDF(1618), AOM_ICDF(4584), AOM_ICDF(4667),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {30913, 31044, 32635, 32640, 32768 },
-        {22081, 22261, 30452, 30477, 32768 },
-        {10561, 10625, 21535, 21568, 32768 },
-        {6081, 6130, 14369, 14423, 32768 },
-        {3777, 3809, 9156, 9225, 32768 },
-        {1857, 1875, 4936, 5018, 32768 } } },
+        {AOM_ICDF(30913), AOM_ICDF(31044), AOM_ICDF(32635), AOM_ICDF(32640),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(22081), AOM_ICDF(22261), AOM_ICDF(30452), AOM_ICDF(30477),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10561), AOM_ICDF(10625), AOM_ICDF(21535), AOM_ICDF(21568),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6081), AOM_ICDF(6130), AOM_ICDF(14369), AOM_ICDF(14423),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3777), AOM_ICDF(3809), AOM_ICDF(9156), AOM_ICDF(9225),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(1857), AOM_ICDF(1875), AOM_ICDF(4936), AOM_ICDF(5018),
+         AOM_ICDF(32768) } } },
     {   // Intra
       { // Band 0
-        { 4672, 6927, 23534, 29846, 30928, 32768 },
-        { 3776, 6784, 18075, 25863, 27926, 32768 },
-        { 1344, 5588, 12166, 20966, 23504, 32768 } },
+        { AOM_ICDF(4672), AOM_ICDF(6927), AOM_ICDF(23534), AOM_ICDF(29846),
+          AOM_ICDF(30928), AOM_ICDF(32768) },
+        { AOM_ICDF(3776), AOM_ICDF(6784), AOM_ICDF(18075), AOM_ICDF(25863),
+          AOM_ICDF(27926), AOM_ICDF(32768) },
+        { AOM_ICDF(1344), AOM_ICDF(5588), AOM_ICDF(12166), AOM_ICDF(20966),
+          AOM_ICDF(23504), AOM_ICDF(32768) } },
       { // Band 1
-        {19393, 22016, 31280, 31444, 32768 },
-        {21185, 24329, 31706, 31865, 32768 },
-        {20673, 23240, 31186, 31379, 32768 },
-        {17857, 20035, 29594, 29889, 32768 },
-        {13633, 14929, 24883, 25337, 32768 },
-        {7873, 8416, 17452, 17886, 32768 } },
+        {AOM_ICDF(19393), AOM_ICDF(22016), AOM_ICDF(31280), AOM_ICDF(31444),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(21185), AOM_ICDF(24329), AOM_ICDF(31706), AOM_ICDF(31865),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(20673), AOM_ICDF(23240), AOM_ICDF(31186), AOM_ICDF(31379),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(17857), AOM_ICDF(20035), AOM_ICDF(29594), AOM_ICDF(29889),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(13633), AOM_ICDF(14929), AOM_ICDF(24883), AOM_ICDF(25337),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7873), AOM_ICDF(8416), AOM_ICDF(17452), AOM_ICDF(17886),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {25665, 27145, 32256, 32314, 32768 },
-        {21057, 22826, 31465, 31576, 32768 },
-        {13633, 14885, 27873, 28088, 32768 },
-        {8769, 9515, 21941, 22248, 32768 },
-        {6209, 6594, 15598, 15950, 32768 },
-        {1985, 2014, 6855, 6931, 32768 } },
+        {AOM_ICDF(25665), AOM_ICDF(27145), AOM_ICDF(32256), AOM_ICDF(32314),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(21057), AOM_ICDF(22826), AOM_ICDF(31465), AOM_ICDF(31576),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(13633), AOM_ICDF(14885), AOM_ICDF(27873), AOM_ICDF(28088),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(8769), AOM_ICDF(9515), AOM_ICDF(21941), AOM_ICDF(22248),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(6209), AOM_ICDF(6594), AOM_ICDF(15598), AOM_ICDF(15950),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(1985), AOM_ICDF(2014), AOM_ICDF(6855), AOM_ICDF(6931),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {26817, 27824, 32362, 32399, 32768 },
-        {21185, 22321, 31389, 31466, 32768 },
-        {13761, 14154, 27163, 27245, 32768 },
-        {8897, 9011, 20600, 20659, 32768 },
-        {4673, 4774, 15044, 15131, 32768 },
-        {193, 194, 384, 479, 32768 } },
+        {AOM_ICDF(26817), AOM_ICDF(27824), AOM_ICDF(32362), AOM_ICDF(32399),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(21185), AOM_ICDF(22321), AOM_ICDF(31389), AOM_ICDF(31466),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(13761), AOM_ICDF(14154), AOM_ICDF(27163), AOM_ICDF(27245),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(8897), AOM_ICDF(9011), AOM_ICDF(20600), AOM_ICDF(20659),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4673), AOM_ICDF(4774), AOM_ICDF(15044), AOM_ICDF(15131),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(194), AOM_ICDF(384), AOM_ICDF(479),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {28865, 29687, 32655, 32667, 32768 },
-        {23233, 24218, 32080, 32118, 32768 },
-        {15041, 15444, 28787, 28845, 32768 },
-        {9921, 10248, 22818, 22944, 32768 },
-        {7745, 7866, 16591, 16702, 32768 },
-        {193, 194, 384, 479, 32768 } },
+        {AOM_ICDF(28865), AOM_ICDF(29687), AOM_ICDF(32655), AOM_ICDF(32667),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(23233), AOM_ICDF(24218), AOM_ICDF(32080), AOM_ICDF(32118),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15041), AOM_ICDF(15444), AOM_ICDF(28787), AOM_ICDF(28845),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9921), AOM_ICDF(10248), AOM_ICDF(22818), AOM_ICDF(22944),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7745), AOM_ICDF(7866), AOM_ICDF(16591), AOM_ICDF(16702),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(194), AOM_ICDF(384), AOM_ICDF(479),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {31169, 31559, 32741, 32744, 32768 },
-        {24769, 25583, 32347, 32370, 32768 },
-        {15937, 16169, 29120, 29152, 32768 },
-        {7489, 7578, 22647, 22677, 32768 },
-        {7617, 7689, 19849, 19887, 32768 },
-        {2113, 2183, 7202, 7377, 32768 } } } },
+        {AOM_ICDF(31169), AOM_ICDF(31559), AOM_ICDF(32741), AOM_ICDF(32744),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(24769), AOM_ICDF(25583), AOM_ICDF(32347), AOM_ICDF(32370),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15937), AOM_ICDF(16169), AOM_ICDF(29120), AOM_ICDF(29152),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7489), AOM_ICDF(7578), AOM_ICDF(22647), AOM_ICDF(22677),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7617), AOM_ICDF(7689), AOM_ICDF(19849), AOM_ICDF(19887),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2113), AOM_ICDF(2183), AOM_ICDF(7202), AOM_ICDF(7377),
+         AOM_ICDF(32768) } } } },
   {     // UV plane
     {   // Inter
       { // Band 0
-        { 23232, 24301, 30231, 31582, 32091, 32768 },
-        { 7872, 11041, 22542, 27086, 29145, 32768 },
-        { 1344, 3989, 18125, 25340, 27820, 32768 } },
+        { AOM_ICDF(23232), AOM_ICDF(24301), AOM_ICDF(30231), AOM_ICDF(31582),
+          AOM_ICDF(32091), AOM_ICDF(32768) },
+        { AOM_ICDF(7872), AOM_ICDF(11041), AOM_ICDF(22542), AOM_ICDF(27086),
+          AOM_ICDF(29145), AOM_ICDF(32768) },
+        { AOM_ICDF(1344), AOM_ICDF(3989), AOM_ICDF(18125), AOM_ICDF(25340),
+          AOM_ICDF(27820), AOM_ICDF(32768) } },
       { // Band 1
-        {15937, 29000, 32210, 32434, 32768 },
-        {12353, 26626, 31533, 31993, 32768 },
-        {11457, 29187, 30896, 31750, 32768 },
-        {5697, 21278, 28169, 29764, 32768 },
-        {7489, 8855, 13365, 15620, 32768 },
-        {4289, 4833, 8572, 10108, 32768 } },
+        {AOM_ICDF(15937), AOM_ICDF(29000), AOM_ICDF(32210), AOM_ICDF(32434),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(12353), AOM_ICDF(26626), AOM_ICDF(31533), AOM_ICDF(31993),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11457), AOM_ICDF(29187), AOM_ICDF(30896), AOM_ICDF(31750),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5697), AOM_ICDF(21278), AOM_ICDF(28169), AOM_ICDF(29764),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(7489), AOM_ICDF(8855), AOM_ICDF(13365), AOM_ICDF(15620),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4289), AOM_ICDF(4833), AOM_ICDF(8572), AOM_ICDF(10108),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {25025, 30783, 32603, 32666, 32768 },
-        {24385, 29586, 31803, 32142, 32768 },
-        {22337, 23002, 27573, 27903, 32768 },
-        {10945, 12336, 21900, 22590, 32768 },
-        {8257, 8830, 19986, 20298, 32768 },
-        {10945, 10990, 18660, 18701, 32768 } },
+        {AOM_ICDF(25025), AOM_ICDF(30783), AOM_ICDF(32603), AOM_ICDF(32666),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(24385), AOM_ICDF(29586), AOM_ICDF(31803), AOM_ICDF(32142),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(22337), AOM_ICDF(23002), AOM_ICDF(27573), AOM_ICDF(27903),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10945), AOM_ICDF(12336), AOM_ICDF(21900), AOM_ICDF(22590),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(8257), AOM_ICDF(8830), AOM_ICDF(19986), AOM_ICDF(20298),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10945), AOM_ICDF(10990), AOM_ICDF(18660), AOM_ICDF(18701),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {29761, 31473, 32693, 32715, 32768 },
-        {20417, 24512, 31394, 31650, 32768 },
-        {11713, 13283, 25819, 26206, 32768 },
-        {13121, 14099, 21909, 22514, 32768 },
-        {193, 248, 9546, 9614, 32768 },
-        {2497, 2524, 7050, 7125, 32768 } },
+        {AOM_ICDF(29761), AOM_ICDF(31473), AOM_ICDF(32693), AOM_ICDF(32715),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(20417), AOM_ICDF(24512), AOM_ICDF(31394), AOM_ICDF(31650),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(11713), AOM_ICDF(13283), AOM_ICDF(25819), AOM_ICDF(26206),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(13121), AOM_ICDF(14099), AOM_ICDF(21909), AOM_ICDF(22514),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(248), AOM_ICDF(9546), AOM_ICDF(9614),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2497), AOM_ICDF(2524), AOM_ICDF(7050), AOM_ICDF(7125),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {30657, 31885, 32691, 32715, 32768 },
-        {19393, 26050, 31698, 31988, 32768 },
-        {15809, 15863, 24985, 25008, 32768 },
-        {23489, 28138, 32751, 32756, 32768 },
-        {16449, 16450, 16545, 16593, 32768 },
-        {2369, 2395, 6822, 6898, 32768 } },
+        {AOM_ICDF(30657), AOM_ICDF(31885), AOM_ICDF(32691), AOM_ICDF(32715),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(19393), AOM_ICDF(26050), AOM_ICDF(31698), AOM_ICDF(31988),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(15809), AOM_ICDF(15863), AOM_ICDF(24985), AOM_ICDF(25008),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(23489), AOM_ICDF(28138), AOM_ICDF(32751), AOM_ICDF(32756),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16449), AOM_ICDF(16450), AOM_ICDF(16545), AOM_ICDF(16593),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2369), AOM_ICDF(2395), AOM_ICDF(6822), AOM_ICDF(6898),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {32705, 32744, 32766, 32767, 32768 },
-        {21953, 24962, 32156, 32246, 32768 },
-        {13121, 15358, 26284, 26835, 32768 },
-        {5697, 7417, 20132, 20885, 32768 },
-        {4417, 4939, 15104, 15535, 32768 },
-        {2625, 2680, 8218, 8338, 32768 } } },
+        {AOM_ICDF(32705), AOM_ICDF(32744), AOM_ICDF(32766), AOM_ICDF(32767),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(21953), AOM_ICDF(24962), AOM_ICDF(32156), AOM_ICDF(32246),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(13121), AOM_ICDF(15358), AOM_ICDF(26284), AOM_ICDF(26835),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5697), AOM_ICDF(7417), AOM_ICDF(20132), AOM_ICDF(20885),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4417), AOM_ICDF(4939), AOM_ICDF(15104), AOM_ICDF(15535),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2625), AOM_ICDF(2680), AOM_ICDF(8218), AOM_ICDF(8338),
+         AOM_ICDF(32768) } } },
     {   // Inter
       { // Band 0
-        { 25280, 25678, 32446, 32622, 32724, 32768 },
-        { 10560, 11822, 28682, 29919, 31276, 32768 },
-        { 3264, 5170, 21779, 24026, 27905, 32768 } },
+        { AOM_ICDF(25280), AOM_ICDF(25678), AOM_ICDF(32446), AOM_ICDF(32622),
+          AOM_ICDF(32724), AOM_ICDF(32768) },
+        { AOM_ICDF(10560), AOM_ICDF(11822), AOM_ICDF(28682), AOM_ICDF(29919),
+          AOM_ICDF(31276), AOM_ICDF(32768) },
+        { AOM_ICDF(3264), AOM_ICDF(5170), AOM_ICDF(21779), AOM_ICDF(24026),
+          AOM_ICDF(27905), AOM_ICDF(32768) } },
       { // Band 1
-        {24257, 30554, 32719, 32738, 32768 },
-        {17217, 27413, 32617, 32667, 32768 },
-        {22977, 27600, 32482, 32552, 32768 },
-        {16833, 24360, 30746, 31293, 32768 },
-        {17089, 20060, 28880, 29370, 32768 },
-        {10945, 11009, 21900, 21932, 32768 } },
+        {AOM_ICDF(24257), AOM_ICDF(30554), AOM_ICDF(32719), AOM_ICDF(32738),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(17217), AOM_ICDF(27413), AOM_ICDF(32617), AOM_ICDF(32667),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(22977), AOM_ICDF(27600), AOM_ICDF(32482), AOM_ICDF(32552),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16833), AOM_ICDF(24360), AOM_ICDF(30746), AOM_ICDF(31293),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(17089), AOM_ICDF(20060), AOM_ICDF(28880), AOM_ICDF(29370),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(10945), AOM_ICDF(11009), AOM_ICDF(21900), AOM_ICDF(21932),
+         AOM_ICDF(32768) } },
       { // Band 2
-        {27201, 30217, 32736, 32745, 32768 },
-        {22721, 27676, 32749, 32754, 32768 },
-        {5057, 12431, 25246, 26620, 32768 },
-        {193, 321, 22016, 22048, 32768 },
-        {5313, 5363, 13839, 13894, 32768 },
-        {2625, 2652, 7276, 7351, 32768 } },
+        {AOM_ICDF(27201), AOM_ICDF(30217), AOM_ICDF(32736), AOM_ICDF(32745),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(22721), AOM_ICDF(27676), AOM_ICDF(32749), AOM_ICDF(32754),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5057), AOM_ICDF(12431), AOM_ICDF(25246), AOM_ICDF(26620),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(321), AOM_ICDF(22016), AOM_ICDF(22048),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5313), AOM_ICDF(5363), AOM_ICDF(13839), AOM_ICDF(13894),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2625), AOM_ICDF(2652), AOM_ICDF(7276), AOM_ICDF(7351),
+         AOM_ICDF(32768) } },
       { // Band 3
-        {27713, 30739, 32759, 32762, 32768 },
-        {26177, 30430, 32756, 32760, 32768 },
-        {193, 384, 32706, 32707, 32768 },
-        {9409, 9528, 21591, 21646, 32768 },
-        {193, 194, 384, 479, 32768 },
-        {2881, 2913, 8427, 8498, 32768 } },
+        {AOM_ICDF(27713), AOM_ICDF(30739), AOM_ICDF(32759), AOM_ICDF(32762),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(26177), AOM_ICDF(30430), AOM_ICDF(32756), AOM_ICDF(32760),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(384), AOM_ICDF(32706), AOM_ICDF(32707),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(9409), AOM_ICDF(9528), AOM_ICDF(21591), AOM_ICDF(21646),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(194), AOM_ICDF(384), AOM_ICDF(479),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2881), AOM_ICDF(2913), AOM_ICDF(8427), AOM_ICDF(8498),
+         AOM_ICDF(32768) } },
       { // Band 4
-        {28993, 31156, 32747, 32753, 32768 },
-        {25153, 28701, 32754, 32758, 32768 },
-        {16449, 16544, 32737, 32738, 32768 },
-        {193, 321, 22016, 22048, 32768 },
-        {193, 194, 384, 479, 32768 },
-        {2753, 2789, 8909, 8979, 32768 } },
+        {AOM_ICDF(28993), AOM_ICDF(31156), AOM_ICDF(32747), AOM_ICDF(32753),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(25153), AOM_ICDF(28701), AOM_ICDF(32754), AOM_ICDF(32758),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(16449), AOM_ICDF(16544), AOM_ICDF(32737), AOM_ICDF(32738),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(321), AOM_ICDF(22016), AOM_ICDF(22048),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(193), AOM_ICDF(194), AOM_ICDF(384), AOM_ICDF(479),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(2753), AOM_ICDF(2789), AOM_ICDF(8909), AOM_ICDF(8979),
+         AOM_ICDF(32768) } },
       { // Band 5
-        {30785, 32088, 32765, 32766, 32768 },
-        {22977, 26623, 32750, 32754, 32768 },
-        {21953, 21954, 22017, 22049, 32768 },
-        {5697, 7486, 20238, 21009, 32768 },
-        {4929, 5579, 16402, 16866, 32768 },
-        {3009, 3246, 10158, 10533, 32768 } } } }
+        {AOM_ICDF(30785), AOM_ICDF(32088), AOM_ICDF(32765), AOM_ICDF(32766),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(22977), AOM_ICDF(26623), AOM_ICDF(32750), AOM_ICDF(32754),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(21953), AOM_ICDF(21954), AOM_ICDF(22017), AOM_ICDF(22049),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(5697), AOM_ICDF(7486), AOM_ICDF(20238), AOM_ICDF(21009),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(4929), AOM_ICDF(5579), AOM_ICDF(16402), AOM_ICDF(16866),
+         AOM_ICDF(32768) },
+        {AOM_ICDF(3009), AOM_ICDF(3246), AOM_ICDF(10158), AOM_ICDF(10533),
+         AOM_ICDF(32768) } } } }
 };
 #endif  // CONFIG_NEW_TOKENSET
 
@@ -5367,10 +5936,13 @@
                             aom_cdf_prob cdf_head[CDF_SIZE(ENTROPY_TOKENS)],
                             int band_zero) {
   int probNZ, prob1, prob_idx, i;
-  int phead[HEAD_TOKENS + 1], sum, p;
+  int phead[HEAD_TOKENS + 1], sum;
   const int is_dc = !!band_zero;
+  aom_cdf_prob prev_cdf;
+  prev_cdf = 0;
   for (i = 0; i < HEAD_TOKENS + is_dc; ++i) {
-    phead[i] = cdf_head[i] - (i == 0 ? 0 : cdf_head[i - 1]);
+    phead[i] = AOM_ICDF(cdf_head[i]) - prev_cdf;
+    prev_cdf = AOM_ICDF(cdf_head[i]);
   }
   // Do the tail
   probNZ = CDF_PROB_TOP - phead[ZERO_TOKEN + is_dc] - (is_dc ? phead[0] : 0);
@@ -5380,8 +5952,8 @@
 
   sum = 0;
   for (i = 0; i < TAIL_TOKENS; ++i) {
-    p = av1_pareto8_tail_probs[prob_idx][i];
-    cdf_tail[i] = sum += p;
+    sum += av1_pareto8_tail_probs[prob_idx][i];
+    cdf_tail[i] = AOM_ICDF(sum);
   }
 }
 
@@ -5455,11 +6027,11 @@
 
   for (i = 0; i < last_head_val; ++i) {
     int c0;
-    c0 = i > 0 ? cdf_head[i - 1] : 0;
+    c0 = i > 0 ? AOM_ICDF(cdf_head[i - 1]) : 0;
     p = AOMMAX(1, AOMMIN(CDF_PROB_TOP - (last_head_val - i) - c0, phead[i]));
-    cdf_head[i] = c0 + p;
+    cdf_head[i] = AOM_ICDF(c0 + p);
   }
-  cdf_head[last_head_val] = CDF_PROB_TOP;
+  cdf_head[last_head_val] = AOM_ICDF(CDF_PROB_TOP);
 }
 
 static void av1_default_coef_cdfs(FRAME_CONTEXT *fc) {
@@ -5507,7 +6079,8 @@
   int i, sum = 0;
   assert(pdf_model[2] != 0);
   for (i = 0; i < ENTROPY_TOKENS - 2; ++i) {
-    cdf[i] = sum += av1_pareto8_token_probs[pdf_model[2] - 1][i];
+    sum += av1_pareto8_token_probs[pdf_model[2] - 1][i];
+    cdf[i] = AOM_ICDF(sum);
   }
 }
 #endif  // CONFIG_NEW_TOKENSET
@@ -5663,18 +6236,21 @@
 #if CONFIG_EC_ADAPT
 static void av1_average_cdf(aom_cdf_prob *cdf_ptr[], aom_cdf_prob *fc_cdf_ptr,
                             int cdf_size, const int num_tiles) {
-  int i, j;
-  aom_cdf_prob last_val = 0;
-  for (i = 0; i < cdf_size; ++i) {
-    // Zero symbol counts for the next frame
-    if (last_val == CDF_PROB_TOP) {
-      fc_cdf_ptr[i] = 0;
-    } else {
+  int i;
+  for (i = 0; i < cdf_size;) {
+    do {
       int sum = 0;
-      for (j = 0; j < num_tiles; ++j) sum += cdf_ptr[j][i];
-      fc_cdf_ptr[i] = sum / num_tiles;
+      int j;
+      assert(i < cdf_size);
+      for (j = 0; j < num_tiles; ++j) sum += AOM_ICDF(cdf_ptr[j][i]);
+      fc_cdf_ptr[i] = AOM_ICDF(sum / num_tiles);
+    } while (fc_cdf_ptr[i++] != AOM_ICDF(CDF_PROB_TOP));
+    // Zero symbol counts for the next frame
+    assert(i < cdf_size);
+    fc_cdf_ptr[i++] = 0;
+    // Skip trailing zeros until the start of the next CDF.
+    for (; i < cdf_size && fc_cdf_ptr[i] == 0; ++i) {
     }
-    last_val = fc_cdf_ptr[i];
   }
 }
 
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 611cc3e..5ff7cfc 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -891,7 +891,7 @@
 static const aom_prob default_delta_q_probs[DELTA_Q_PROBS] = { 220, 220, 220 };
 #if CONFIG_EC_MULTISYMBOL
 static const aom_cdf_prob default_delta_q_cdf[CDF_SIZE(DELTA_Q_PROBS + 1)] = {
-  28160, 32120, 32677, 32768, 0
+  AOM_ICDF(28160), AOM_ICDF(32120), AOM_ICDF(32677), AOM_ICDF(32768), 0
 };
 #endif
 #endif
@@ -1846,157 +1846,250 @@
 static const aom_cdf_prob
     default_switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS][CDF_SIZE(
         SWITCHABLE_FILTERS)] = {
-      { 30080, 31088, 32096, 32768, 0 }, { 4608, 9620, 31338, 32768, 0 },
-      { 4352, 5240, 6128, 32768, 0 },    { 4352, 5240, 6128, 32768, 0 },
-      { 19072, 23352, 27632, 32768, 0 }, { 30080, 31088, 32096, 32768, 0 },
-      { 4608, 9620, 31338, 32768, 0 },   { 4352, 5240, 6128, 32768, 0 },
-      { 4352, 5240, 6128, 32768, 0 },    { 19072, 23352, 27632, 32768, 0 },
-      { 30080, 31088, 32096, 32768, 0 }, { 4608, 9620, 31338, 32768, 0 },
-      { 4352, 5240, 6128, 32768, 0 },    { 4352, 5240, 6128, 32768, 0 },
-      { 19072, 23352, 27632, 32768, 0 }, { 30080, 31088, 32096, 32768, 0 },
-      { 4608, 9620, 31338, 32768, 0 },   { 4352, 5240, 6128, 32768, 0 },
-      { 4352, 5240, 6128, 32768, 0 },    { 19072, 23352, 27632, 32768, 0 }
+      { AOM_ICDF(30080), AOM_ICDF(31088), AOM_ICDF(32096), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4608), AOM_ICDF(9620), AOM_ICDF(31338), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4352), AOM_ICDF(5240), AOM_ICDF(6128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4352), AOM_ICDF(5240), AOM_ICDF(6128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(19072), AOM_ICDF(23352), AOM_ICDF(27632), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(30080), AOM_ICDF(31088), AOM_ICDF(32096), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4608), AOM_ICDF(9620), AOM_ICDF(31338), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4352), AOM_ICDF(5240), AOM_ICDF(6128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4352), AOM_ICDF(5240), AOM_ICDF(6128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(19072), AOM_ICDF(23352), AOM_ICDF(27632), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(30080), AOM_ICDF(31088), AOM_ICDF(32096), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4608), AOM_ICDF(9620), AOM_ICDF(31338), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4352), AOM_ICDF(5240), AOM_ICDF(6128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4352), AOM_ICDF(5240), AOM_ICDF(6128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(19072), AOM_ICDF(23352), AOM_ICDF(27632), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(30080), AOM_ICDF(31088), AOM_ICDF(32096), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4608), AOM_ICDF(9620), AOM_ICDF(31338), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4352), AOM_ICDF(5240), AOM_ICDF(6128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4352), AOM_ICDF(5240), AOM_ICDF(6128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(19072), AOM_ICDF(23352), AOM_ICDF(27632), AOM_ICDF(32768), 0 }
     };
 #else
 static const aom_cdf_prob
-    default_switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS]
-                                 [CDF_SIZE(SWITCHABLE_FILTERS)] = {
-                                   { 30080, 31781, 32768, 0 },
-                                   { 4608, 32658, 32768, 0 },
-                                   { 4352, 4685, 32768, 0 },
-                                   { 19072, 26776, 32768, 0 },
-                                 };
+    default_switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS][CDF_SIZE(
+        SWITCHABLE_FILTERS)] = {
+      { AOM_ICDF(30080), AOM_ICDF(31781), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4608), AOM_ICDF(32658), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(4352), AOM_ICDF(4685), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(19072), AOM_ICDF(26776), AOM_ICDF(32768), 0 },
+    };
 #endif
 
 static const aom_cdf_prob default_seg_tree_cdf[CDF_SIZE(MAX_SEGMENTS)] = {
-  4096, 8192, 12288, 16384, 20480, 24576, 28672, 32768, 0
+  AOM_ICDF(4096),  AOM_ICDF(8192),  AOM_ICDF(12288),
+  AOM_ICDF(16384), AOM_ICDF(20480), AOM_ICDF(24576),
+  AOM_ICDF(28672), AOM_ICDF(32768), 0
 };
 
 static const aom_cdf_prob
     default_tx_size_cdf[MAX_TX_DEPTH][TX_SIZE_CONTEXTS][CDF_SIZE(MAX_TX_DEPTH +
                                                                  1)] = {
-      { { 12800, 32768, 0 }, { 8448, 32768, 0 } },
-      { { 2560, 20496, 32768, 0 }, { 1920, 14091, 32768, 0 } },
-      { { 384, 17588, 19782, 32768, 0 }, { 640, 7166, 8466, 32768, 0 } },
+      { { AOM_ICDF(12800), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(8448), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(2560), AOM_ICDF(20496), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(1920), AOM_ICDF(14091), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(384), AOM_ICDF(17588), AOM_ICDF(19782), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(640), AOM_ICDF(7166), AOM_ICDF(8466), AOM_ICDF(32768), 0 } },
 #if CONFIG_TX64X64
-      { { 128, 8288, 21293, 26986, 32768, 0 },
-        { 128, 4208, 10009, 15965, 32768, 0 } },
+      { { AOM_ICDF(128), AOM_ICDF(8288), AOM_ICDF(21293), AOM_ICDF(26986),
+          AOM_ICDF(32768), 0 },
+        { AOM_ICDF(128), AOM_ICDF(4208), AOM_ICDF(10009), AOM_ICDF(15965),
+          AOM_ICDF(32768), 0 } },
 #endif
     };
 
 #if CONFIG_ALT_INTRA
 static const aom_cdf_prob
     default_if_y_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(INTRA_MODES)] = {
-      { 11264, 12608, 16309, 21086, 23297, 24860, 27022, 28099, 29631, 31126,
-        32768, 0 },
-      { 9600, 11953, 16100, 20922, 22756, 23913, 25435, 26724, 28046, 29927,
-        32768, 0 },
-      { 9344, 11540, 16515, 21763, 23078, 23816, 24725, 25856, 26720, 28208,
-        32768, 0 },
-      { 12288, 14448, 18026, 23346, 23833, 24188, 24724, 25415, 25817, 26876,
-        32768, 0 },
+      { AOM_ICDF(11264), AOM_ICDF(12608), AOM_ICDF(16309), AOM_ICDF(21086),
+        AOM_ICDF(23297), AOM_ICDF(24860), AOM_ICDF(27022), AOM_ICDF(28099),
+        AOM_ICDF(29631), AOM_ICDF(31126), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(9600), AOM_ICDF(11953), AOM_ICDF(16100), AOM_ICDF(20922),
+        AOM_ICDF(22756), AOM_ICDF(23913), AOM_ICDF(25435), AOM_ICDF(26724),
+        AOM_ICDF(28046), AOM_ICDF(29927), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(9344), AOM_ICDF(11540), AOM_ICDF(16515), AOM_ICDF(21763),
+        AOM_ICDF(23078), AOM_ICDF(23816), AOM_ICDF(24725), AOM_ICDF(25856),
+        AOM_ICDF(26720), AOM_ICDF(28208), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(12288), AOM_ICDF(14448), AOM_ICDF(18026), AOM_ICDF(23346),
+        AOM_ICDF(23833), AOM_ICDF(24188), AOM_ICDF(24724), AOM_ICDF(25415),
+        AOM_ICDF(25817), AOM_ICDF(26876), AOM_ICDF(32768), 0 },
     };
 
 static const aom_cdf_prob
     default_uv_mode_cdf[INTRA_MODES][CDF_SIZE(INTRA_MODES)] = {
-      { 25472, 25558, 27783, 30779, 30988, 31269, 31492, 31741, 32014, 32420,
-        32768, 0 },
-      { 2176, 2415, 28381, 29574, 29832, 30712, 30881, 31662, 31761, 31922,
-        32768, 0 },
-      { 3328, 3443, 4016, 31099, 31272, 31420, 31504, 31608, 31916, 32598,
-        32768, 0 },
-      { 23424, 23534, 25915, 27831, 28058, 28431, 30142, 31209, 31459, 32369,
-        32768, 0 },
-      { 22784, 22862, 24255, 26287, 28490, 29509, 29776, 30115, 31203, 31674,
-        32768, 0 },
-      { 19712, 19865, 23141, 24428, 25731, 31377, 31622, 32047, 32458, 32767,
-        32768, 0 },
-      { 21376, 21421, 22130, 27688, 28485, 28779, 28935, 29085, 31962, 32450,
-        32768, 0 },
-      { 19712, 19814, 20725, 28510, 28814, 29099, 29457, 29729, 30133, 32408,
-        32768, 0 },
-      { 19584, 19790, 23643, 25501, 25913, 26673, 27578, 30923, 31255, 31870,
-        32768, 0 },
-      { 20864, 21004, 24129, 26308, 27062, 27065, 27488, 28045, 28506, 29272,
-        32768, 0 },
-      { 23680, 23929, 27831, 30446, 30598, 31129, 31244, 31655, 31868, 32234,
-        32768, 0 },
+      { AOM_ICDF(25472), AOM_ICDF(25558), AOM_ICDF(27783), AOM_ICDF(30779),
+        AOM_ICDF(30988), AOM_ICDF(31269), AOM_ICDF(31492), AOM_ICDF(31741),
+        AOM_ICDF(32014), AOM_ICDF(32420), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(2176), AOM_ICDF(2415), AOM_ICDF(28381), AOM_ICDF(29574),
+        AOM_ICDF(29832), AOM_ICDF(30712), AOM_ICDF(30881), AOM_ICDF(31662),
+        AOM_ICDF(31761), AOM_ICDF(31922), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(3328), AOM_ICDF(3443), AOM_ICDF(4016), AOM_ICDF(31099),
+        AOM_ICDF(31272), AOM_ICDF(31420), AOM_ICDF(31504), AOM_ICDF(31608),
+        AOM_ICDF(31916), AOM_ICDF(32598), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(23424), AOM_ICDF(23534), AOM_ICDF(25915), AOM_ICDF(27831),
+        AOM_ICDF(28058), AOM_ICDF(28431), AOM_ICDF(30142), AOM_ICDF(31209),
+        AOM_ICDF(31459), AOM_ICDF(32369), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(22784), AOM_ICDF(22862), AOM_ICDF(24255), AOM_ICDF(26287),
+        AOM_ICDF(28490), AOM_ICDF(29509), AOM_ICDF(29776), AOM_ICDF(30115),
+        AOM_ICDF(31203), AOM_ICDF(31674), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(19712), AOM_ICDF(19865), AOM_ICDF(23141), AOM_ICDF(24428),
+        AOM_ICDF(25731), AOM_ICDF(31377), AOM_ICDF(31622), AOM_ICDF(32047),
+        AOM_ICDF(32458), AOM_ICDF(32767), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(21376), AOM_ICDF(21421), AOM_ICDF(22130), AOM_ICDF(27688),
+        AOM_ICDF(28485), AOM_ICDF(28779), AOM_ICDF(28935), AOM_ICDF(29085),
+        AOM_ICDF(31962), AOM_ICDF(32450), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(19712), AOM_ICDF(19814), AOM_ICDF(20725), AOM_ICDF(28510),
+        AOM_ICDF(28814), AOM_ICDF(29099), AOM_ICDF(29457), AOM_ICDF(29729),
+        AOM_ICDF(30133), AOM_ICDF(32408), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(19584), AOM_ICDF(19790), AOM_ICDF(23643), AOM_ICDF(25501),
+        AOM_ICDF(25913), AOM_ICDF(26673), AOM_ICDF(27578), AOM_ICDF(30923),
+        AOM_ICDF(31255), AOM_ICDF(31870), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(20864), AOM_ICDF(21004), AOM_ICDF(24129), AOM_ICDF(26308),
+        AOM_ICDF(27062), AOM_ICDF(27065), AOM_ICDF(27488), AOM_ICDF(28045),
+        AOM_ICDF(28506), AOM_ICDF(29272), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(23680), AOM_ICDF(23929), AOM_ICDF(27831), AOM_ICDF(30446),
+        AOM_ICDF(30598), AOM_ICDF(31129), AOM_ICDF(31244), AOM_ICDF(31655),
+        AOM_ICDF(31868), AOM_ICDF(32234), AOM_ICDF(32768), 0 },
     };
 #else   // !CONFIG_ALT_INTRA
-static const aom_cdf_prob default_if_y_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(
-    INTRA_MODES)] = {
-  { 8320, 11376, 12880, 19959, 23072, 24067, 25461, 26917, 29157, 32768, 0 },
-  { 16896, 21112, 21932, 27852, 28667, 28916, 29593, 30089, 30905, 32768, 0 },
-  { 22144, 25464, 26006, 30364, 30583, 30655, 31183, 31400, 31646, 32768, 0 },
-  { 28288, 30650, 30964, 32288, 32308, 32331, 32495, 32586, 32607, 32768, 0 },
-};
+static const aom_cdf_prob
+    default_if_y_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(INTRA_MODES)] = {
+      { AOM_ICDF(8320), AOM_ICDF(11376), AOM_ICDF(12880), AOM_ICDF(19959),
+        AOM_ICDF(23072), AOM_ICDF(24067), AOM_ICDF(25461), AOM_ICDF(26917),
+        AOM_ICDF(29157), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(16896), AOM_ICDF(21112), AOM_ICDF(21932), AOM_ICDF(27852),
+        AOM_ICDF(28667), AOM_ICDF(28916), AOM_ICDF(29593), AOM_ICDF(30089),
+        AOM_ICDF(30905), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(22144), AOM_ICDF(25464), AOM_ICDF(26006), AOM_ICDF(30364),
+        AOM_ICDF(30583), AOM_ICDF(30655), AOM_ICDF(31183), AOM_ICDF(31400),
+        AOM_ICDF(31646), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(28288), AOM_ICDF(30650), AOM_ICDF(30964), AOM_ICDF(32288),
+        AOM_ICDF(32308), AOM_ICDF(32331), AOM_ICDF(32495), AOM_ICDF(32586),
+        AOM_ICDF(32607), AOM_ICDF(32768), 0 },
+    };
 
-static const aom_cdf_prob default_uv_mode_cdf[INTRA_MODES][CDF_SIZE(
-    INTRA_MODES)] = {
-  { 15360, 15836, 20863, 27513, 28269, 29048, 29455, 30154, 31206, 32768, 0 },
-  { 6144, 7392, 22657, 25981, 26965, 28779, 29309, 30890, 31763, 32768, 0 },
-  { 8576, 9143, 11450, 27575, 28108, 28438, 28658, 28995, 30410, 32768, 0 },
-  { 12416, 12814, 16244, 22057, 23492, 24700, 26213, 27954, 29778, 32768, 0 },
-  { 10624, 11057, 14619, 19415, 23134, 25679, 26399, 27618, 30676, 32768, 0 },
-  { 10240, 10680, 15684, 19118, 21856, 27563, 28234, 29332, 31278, 32768, 0 },
-  { 11008, 11433, 14100, 22522, 24365, 25330, 25737, 26341, 30433, 32768, 0 },
-  { 10880, 11308, 13991, 23645, 24679, 25433, 25977, 26746, 28463, 32768, 0 },
-  { 9856, 10483, 16054, 19959, 21708, 23628, 24949, 28797, 30658, 32768, 0 },
-  { 12928, 14556, 22168, 27789, 28543, 29663, 29893, 30645, 31682, 32768, 0 },
-};
+static const aom_cdf_prob
+    default_uv_mode_cdf[INTRA_MODES][CDF_SIZE(INTRA_MODES)] = {
+      { AOM_ICDF(15360), AOM_ICDF(15836), AOM_ICDF(20863), AOM_ICDF(27513),
+        AOM_ICDF(28269), AOM_ICDF(29048), AOM_ICDF(29455), AOM_ICDF(30154),
+        AOM_ICDF(31206), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(6144), AOM_ICDF(7392), AOM_ICDF(22657), AOM_ICDF(25981),
+        AOM_ICDF(26965), AOM_ICDF(28779), AOM_ICDF(29309), AOM_ICDF(30890),
+        AOM_ICDF(31763), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(8576), AOM_ICDF(9143), AOM_ICDF(11450), AOM_ICDF(27575),
+        AOM_ICDF(28108), AOM_ICDF(28438), AOM_ICDF(28658), AOM_ICDF(28995),
+        AOM_ICDF(30410), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(12416), AOM_ICDF(12814), AOM_ICDF(16244), AOM_ICDF(22057),
+        AOM_ICDF(23492), AOM_ICDF(24700), AOM_ICDF(26213), AOM_ICDF(27954),
+        AOM_ICDF(29778), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(10624), AOM_ICDF(11057), AOM_ICDF(14619), AOM_ICDF(19415),
+        AOM_ICDF(23134), AOM_ICDF(25679), AOM_ICDF(26399), AOM_ICDF(27618),
+        AOM_ICDF(30676), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(10240), AOM_ICDF(10680), AOM_ICDF(15684), AOM_ICDF(19118),
+        AOM_ICDF(21856), AOM_ICDF(27563), AOM_ICDF(28234), AOM_ICDF(29332),
+        AOM_ICDF(31278), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(11008), AOM_ICDF(11433), AOM_ICDF(14100), AOM_ICDF(22522),
+        AOM_ICDF(24365), AOM_ICDF(25330), AOM_ICDF(25737), AOM_ICDF(26341),
+        AOM_ICDF(30433), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(10880), AOM_ICDF(11308), AOM_ICDF(13991), AOM_ICDF(23645),
+        AOM_ICDF(24679), AOM_ICDF(25433), AOM_ICDF(25977), AOM_ICDF(26746),
+        AOM_ICDF(28463), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(9856), AOM_ICDF(10483), AOM_ICDF(16054), AOM_ICDF(19959),
+        AOM_ICDF(21708), AOM_ICDF(23628), AOM_ICDF(24949), AOM_ICDF(28797),
+        AOM_ICDF(30658), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(12928), AOM_ICDF(14556), AOM_ICDF(22168), AOM_ICDF(27789),
+        AOM_ICDF(28543), AOM_ICDF(29663), AOM_ICDF(29893), AOM_ICDF(30645),
+        AOM_ICDF(31682), AOM_ICDF(32768), 0 },
+    };
 #endif  // CONFIG_ALT_INTRA
 
 #if CONFIG_EXT_PARTITION_TYPES
 static const aom_cdf_prob
     default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(EXT_PARTITION_TYPES)] = {
       // 8x8 -> 4x4 only supports the four legacy partition types
-      { 25472, 28949, 31052, 32768, 0, 0, 0, 0, 0 },
-      { 18816, 22250, 28783, 32768, 0, 0, 0, 0, 0 },
-      { 18944, 26126, 29188, 32768, 0, 0, 0, 0, 0 },
-      { 15488, 22508, 27077, 32768, 0, 0, 0, 0, 0 },
-      { 22272, 23768, 25043, 29996, 30744, 31493, 32130, 32768, 0 },
-      { 11776, 13457, 16315, 28229, 29069, 29910, 31339, 32768, 0 },
-      { 10496, 14802, 16136, 27127, 29280, 31434, 32101, 32768, 0 },
-      { 6784, 8763, 10440, 29110, 30100, 31090, 31929, 32768, 0 },
-      { 22656, 23801, 24702, 30721, 31294, 31867, 32317, 32768, 0 },
-      { 8704, 9926, 12586, 28885, 29496, 30107, 31437, 32768, 0 },
-      { 6656, 10685, 11566, 27857, 29871, 31886, 32327, 32768, 0 },
-      { 2176, 3012, 3690, 31253, 31671, 32090, 32429, 32768, 0 },
-      { 28416, 28705, 28926, 32258, 32402, 32547, 32657, 32768, 0 },
-      { 9216, 9952, 11849, 30134, 30502, 30870, 31819, 32768, 0 },
-      { 7424, 9008, 9528, 30664, 31456, 32248, 32508, 32768, 0 },
-      { 1280, 1710, 2069, 31978, 32193, 32409, 32588, 32768, 0 },
+      { AOM_ICDF(25472), AOM_ICDF(28949), AOM_ICDF(31052), AOM_ICDF(32768), 0,
+        0, 0, 0, 0 },
+      { AOM_ICDF(18816), AOM_ICDF(22250), AOM_ICDF(28783), AOM_ICDF(32768), 0,
+        0, 0, 0, 0 },
+      { AOM_ICDF(18944), AOM_ICDF(26126), AOM_ICDF(29188), AOM_ICDF(32768), 0,
+        0, 0, 0, 0 },
+      { AOM_ICDF(15488), AOM_ICDF(22508), AOM_ICDF(27077), AOM_ICDF(32768), 0,
+        0, 0, 0, 0 },
+      { AOM_ICDF(22272), AOM_ICDF(23768), AOM_ICDF(25043), AOM_ICDF(29996),
+        AOM_ICDF(30744), AOM_ICDF(31493), AOM_ICDF(32130), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(11776), AOM_ICDF(13457), AOM_ICDF(16315), AOM_ICDF(28229),
+        AOM_ICDF(29069), AOM_ICDF(29910), AOM_ICDF(31339), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(10496), AOM_ICDF(14802), AOM_ICDF(16136), AOM_ICDF(27127),
+        AOM_ICDF(29280), AOM_ICDF(31434), AOM_ICDF(32101), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(6784), AOM_ICDF(8763), AOM_ICDF(10440), AOM_ICDF(29110),
+        AOM_ICDF(30100), AOM_ICDF(31090), AOM_ICDF(31929), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(22656), AOM_ICDF(23801), AOM_ICDF(24702), AOM_ICDF(30721),
+        AOM_ICDF(31294), AOM_ICDF(31867), AOM_ICDF(32317), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(8704), AOM_ICDF(9926), AOM_ICDF(12586), AOM_ICDF(28885),
+        AOM_ICDF(29496), AOM_ICDF(30107), AOM_ICDF(31437), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(6656), AOM_ICDF(10685), AOM_ICDF(11566), AOM_ICDF(27857),
+        AOM_ICDF(29871), AOM_ICDF(31886), AOM_ICDF(32327), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(2176), AOM_ICDF(3012), AOM_ICDF(3690), AOM_ICDF(31253),
+        AOM_ICDF(31671), AOM_ICDF(32090), AOM_ICDF(32429), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(28416), AOM_ICDF(28705), AOM_ICDF(28926), AOM_ICDF(32258),
+        AOM_ICDF(32402), AOM_ICDF(32547), AOM_ICDF(32657), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(9216), AOM_ICDF(9952), AOM_ICDF(11849), AOM_ICDF(30134),
+        AOM_ICDF(30502), AOM_ICDF(30870), AOM_ICDF(31819), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(7424), AOM_ICDF(9008), AOM_ICDF(9528), AOM_ICDF(30664),
+        AOM_ICDF(31456), AOM_ICDF(32248), AOM_ICDF(32508), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(1280), AOM_ICDF(1710), AOM_ICDF(2069), AOM_ICDF(31978),
+        AOM_ICDF(32193), AOM_ICDF(32409), AOM_ICDF(32588), AOM_ICDF(32768), 0 },
 #if CONFIG_EXT_PARTITION
-      { 28416, 28705, 28926, 32258, 32402, 32547, 32657, 32768, 0 },
-      { 9216, 9952, 11849, 30134, 30502, 30870, 31819, 32768, 0 },
-      { 7424, 9008, 9528, 30664, 31456, 32248, 32508, 32768, 0 },
-      { 1280, 1710, 2069, 31978, 32193, 32409, 32588, 32768, 0 },
+      { AOM_ICDF(28416), AOM_ICDF(28705), AOM_ICDF(28926), AOM_ICDF(32258),
+        AOM_ICDF(32402), AOM_ICDF(32547), AOM_ICDF(32657), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(9216), AOM_ICDF(9952), AOM_ICDF(11849), AOM_ICDF(30134),
+        AOM_ICDF(30502), AOM_ICDF(30870), AOM_ICDF(31819), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(7424), AOM_ICDF(9008), AOM_ICDF(9528), AOM_ICDF(30664),
+        AOM_ICDF(31456), AOM_ICDF(32248), AOM_ICDF(32508), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(1280), AOM_ICDF(1710), AOM_ICDF(2069), AOM_ICDF(31978),
+        AOM_ICDF(32193), AOM_ICDF(32409), AOM_ICDF(32588), AOM_ICDF(32768), 0 },
 #endif
     };
 #else
 static const aom_cdf_prob
     default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(PARTITION_TYPES)] = {
-      { 25472, 28949, 31052, 32768, 0 }, { 18816, 22250, 28783, 32768, 0 },
-      { 18944, 26126, 29188, 32768, 0 }, { 15488, 22508, 27077, 32768, 0 },
-      { 22272, 25265, 27815, 32768, 0 }, { 11776, 15138, 20854, 32768, 0 },
-      { 10496, 19109, 21777, 32768, 0 }, { 6784, 10743, 14098, 32768, 0 },
-      { 22656, 24947, 26749, 32768, 0 }, { 8704, 11148, 16469, 32768, 0 },
-      { 6656, 14714, 16477, 32768, 0 },  { 2176, 3849, 5205, 32768, 0 },
-      { 28416, 28994, 29436, 32768, 0 }, { 9216, 10688, 14483, 32768, 0 },
-      { 7424, 10592, 11632, 32768, 0 },  { 1280, 2141, 2859, 32768, 0 },
+      { AOM_ICDF(25472), AOM_ICDF(28949), AOM_ICDF(31052), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(18816), AOM_ICDF(22250), AOM_ICDF(28783), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(18944), AOM_ICDF(26126), AOM_ICDF(29188), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(15488), AOM_ICDF(22508), AOM_ICDF(27077), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(22272), AOM_ICDF(25265), AOM_ICDF(27815), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(11776), AOM_ICDF(15138), AOM_ICDF(20854), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(10496), AOM_ICDF(19109), AOM_ICDF(21777), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(6784), AOM_ICDF(10743), AOM_ICDF(14098), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(22656), AOM_ICDF(24947), AOM_ICDF(26749), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(8704), AOM_ICDF(11148), AOM_ICDF(16469), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(6656), AOM_ICDF(14714), AOM_ICDF(16477), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(2176), AOM_ICDF(3849), AOM_ICDF(5205), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(28416), AOM_ICDF(28994), AOM_ICDF(29436), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(9216), AOM_ICDF(10688), AOM_ICDF(14483), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(7424), AOM_ICDF(10592), AOM_ICDF(11632), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(1280), AOM_ICDF(2141), AOM_ICDF(2859), AOM_ICDF(32768), 0 },
 #if CONFIG_EXT_PARTITION
-      { 28416, 28994, 29436, 32768, 0 }, { 9216, 10688, 14483, 32768, 0 },
-      { 7424, 10592, 11632, 32768, 0 },  { 1280, 2141, 2859, 32768, 0 },
+      { AOM_ICDF(28416), AOM_ICDF(28994), AOM_ICDF(29436), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(9216), AOM_ICDF(10688), AOM_ICDF(14483), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(7424), AOM_ICDF(10592), AOM_ICDF(11632), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(1280), AOM_ICDF(2141), AOM_ICDF(2859), AOM_ICDF(32768), 0 },
 #endif
     };
 #endif
 
 static const aom_cdf_prob
     default_inter_mode_cdf[INTER_MODE_CONTEXTS][CDF_SIZE(INTER_MODES)] = {
-      { 256, 22227, 23627, 32768, 0 }, { 896, 18948, 23537, 32768, 0 },
-      { 896, 21563, 24320, 32768, 0 }, { 896, 12599, 17799, 32768, 0 },
-      { 1024, 8960, 13238, 32768, 0 }, { 2176, 11856, 14388, 32768, 0 },
-      { 3200, 6550, 9622, 32768, 0 },
+      { AOM_ICDF(256), AOM_ICDF(22227), AOM_ICDF(23627), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(896), AOM_ICDF(18948), AOM_ICDF(23537), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(896), AOM_ICDF(21563), AOM_ICDF(24320), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(896), AOM_ICDF(12599), AOM_ICDF(17799), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(1024), AOM_ICDF(8960), AOM_ICDF(13238), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(2176), AOM_ICDF(11856), AOM_ICDF(14388), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(3200), AOM_ICDF(6550), AOM_ICDF(9622), AOM_ICDF(32768), 0 },
     };
 
 #if CONFIG_EXT_TX
@@ -2067,118 +2160,206 @@
           },
       },
       {
-          { { 1024, 28800, 29048, 29296, 30164, 31466, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 27118, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 },
-            { 1152, 25852, 26284, 26717, 28230, 30499, 32768, 0 },
-            { 1024, 2016, 3938, 5860, 29404, 31086, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 27118, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 },
-            { 1280, 4109, 5900, 7691, 15528, 27380, 32768, 0 },
-            { 1280, 4109, 5900, 7691, 15528, 27380, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 },
+          { { AOM_ICDF(1024), AOM_ICDF(28800), AOM_ICDF(29048), AOM_ICDF(29296),
+              AOM_ICDF(30164), AOM_ICDF(31466), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(27118), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1152), AOM_ICDF(25852), AOM_ICDF(26284), AOM_ICDF(26717),
+              AOM_ICDF(28230), AOM_ICDF(30499), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1024), AOM_ICDF(2016), AOM_ICDF(3938), AOM_ICDF(5860),
+              AOM_ICDF(29404), AOM_ICDF(31086), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(27118), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(5900), AOM_ICDF(7691),
+              AOM_ICDF(15528), AOM_ICDF(27380), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(5900), AOM_ICDF(7691),
+              AOM_ICDF(15528), AOM_ICDF(27380), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 },
 #if CONFIG_ALT_INTRA
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 }
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 }
 #endif
           },
-          { { 1024, 28800, 29048, 29296, 30164, 31466, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 27118, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 },
-            { 1152, 25852, 26284, 26717, 28230, 30499, 32768, 0 },
-            { 1024, 2016, 3938, 5860, 29404, 31086, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 27118, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 },
-            { 1280, 4109, 5900, 7691, 15528, 27380, 32768, 0 },
-            { 1280, 4109, 5900, 7691, 15528, 27380, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 },
+          { { AOM_ICDF(1024), AOM_ICDF(28800), AOM_ICDF(29048), AOM_ICDF(29296),
+              AOM_ICDF(30164), AOM_ICDF(31466), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(27118), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1152), AOM_ICDF(25852), AOM_ICDF(26284), AOM_ICDF(26717),
+              AOM_ICDF(28230), AOM_ICDF(30499), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1024), AOM_ICDF(2016), AOM_ICDF(3938), AOM_ICDF(5860),
+              AOM_ICDF(29404), AOM_ICDF(31086), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(27118), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(5900), AOM_ICDF(7691),
+              AOM_ICDF(15528), AOM_ICDF(27380), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(5900), AOM_ICDF(7691),
+              AOM_ICDF(15528), AOM_ICDF(27380), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 },
 #if CONFIG_ALT_INTRA
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 }
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 }
 #endif
           },
-          { { 1024, 28800, 29048, 29296, 30164, 31466, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 27118, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 },
-            { 1152, 25852, 26284, 26717, 28230, 30499, 32768, 0 },
-            { 1024, 2016, 3938, 5860, 29404, 31086, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 27118, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 },
-            { 1280, 4109, 5900, 7691, 15528, 27380, 32768, 0 },
-            { 1280, 4109, 5900, 7691, 15528, 27380, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 },
+          { { AOM_ICDF(1024), AOM_ICDF(28800), AOM_ICDF(29048), AOM_ICDF(29296),
+              AOM_ICDF(30164), AOM_ICDF(31466), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(27118), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1152), AOM_ICDF(25852), AOM_ICDF(26284), AOM_ICDF(26717),
+              AOM_ICDF(28230), AOM_ICDF(30499), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1024), AOM_ICDF(2016), AOM_ICDF(3938), AOM_ICDF(5860),
+              AOM_ICDF(29404), AOM_ICDF(31086), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(27118), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(5900), AOM_ICDF(7691),
+              AOM_ICDF(15528), AOM_ICDF(27380), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(5900), AOM_ICDF(7691),
+              AOM_ICDF(15528), AOM_ICDF(27380), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 },
 #if CONFIG_ALT_INTRA
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 }
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 }
 #endif
           },
-          { { 1024, 28800, 29048, 29296, 30164, 31466, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 27118, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 },
-            { 1152, 25852, 26284, 26717, 28230, 30499, 32768, 0 },
-            { 1024, 2016, 3938, 5860, 29404, 31086, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 27118, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 },
-            { 1280, 4109, 5900, 7691, 15528, 27380, 32768, 0 },
-            { 1280, 4109, 5900, 7691, 15528, 27380, 32768, 0 },
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 },
+          { { AOM_ICDF(1024), AOM_ICDF(28800), AOM_ICDF(29048), AOM_ICDF(29296),
+              AOM_ICDF(30164), AOM_ICDF(31466), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(27118), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1152), AOM_ICDF(25852), AOM_ICDF(26284), AOM_ICDF(26717),
+              AOM_ICDF(28230), AOM_ICDF(30499), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1024), AOM_ICDF(2016), AOM_ICDF(3938), AOM_ICDF(5860),
+              AOM_ICDF(29404), AOM_ICDF(31086), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(27118), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(5900), AOM_ICDF(7691),
+              AOM_ICDF(15528), AOM_ICDF(27380), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(5900), AOM_ICDF(7691),
+              AOM_ICDF(15528), AOM_ICDF(27380), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 },
 #if CONFIG_ALT_INTRA
-            { 1280, 5216, 6938, 8660, 10167, 15817, 32768, 0 }
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(8660),
+              AOM_ICDF(10167), AOM_ICDF(15817), AOM_ICDF(32768), 0 }
 #endif
           },
       },
       {
-          { { 1024, 28800, 29792, 31280, 32768, 0 },
-            { 1280, 5216, 6938, 26310, 32768, 0 },
-            { 1280, 5216, 6938, 13396, 32768, 0 },
-            { 1152, 25852, 27581, 30174, 32768, 0 },
-            { 1024, 2016, 28924, 30846, 32768, 0 },
-            { 1280, 5216, 6938, 26310, 32768, 0 },
-            { 1280, 5216, 6938, 13396, 32768, 0 },
-            { 1280, 4109, 13065, 26611, 32768, 0 },
-            { 1280, 4109, 13065, 26611, 32768, 0 },
-            { 1280, 5216, 6938, 13396, 32768, 0 },
+          { { AOM_ICDF(1024), AOM_ICDF(28800), AOM_ICDF(29792), AOM_ICDF(31280),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(26310),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1152), AOM_ICDF(25852), AOM_ICDF(27581), AOM_ICDF(30174),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1024), AOM_ICDF(2016), AOM_ICDF(28924), AOM_ICDF(30846),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(26310),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(13065), AOM_ICDF(26611),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(13065), AOM_ICDF(26611),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 },
 #if CONFIG_ALT_INTRA
-            { 1280, 5216, 6938, 13396, 32768, 0 }
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 }
 #endif
           },
-          { { 1024, 28800, 29792, 31280, 32768, 0 },
-            { 1280, 5216, 6938, 26310, 32768, 0 },
-            { 1280, 5216, 6938, 13396, 32768, 0 },
-            { 1152, 25852, 27581, 30174, 32768, 0 },
-            { 1024, 2016, 28924, 30846, 32768, 0 },
-            { 1280, 5216, 6938, 26310, 32768, 0 },
-            { 1280, 5216, 6938, 13396, 32768, 0 },
-            { 1280, 4109, 13065, 26611, 32768, 0 },
-            { 1280, 4109, 13065, 26611, 32768, 0 },
-            { 1280, 5216, 6938, 13396, 32768, 0 },
+          { { AOM_ICDF(1024), AOM_ICDF(28800), AOM_ICDF(29792), AOM_ICDF(31280),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(26310),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1152), AOM_ICDF(25852), AOM_ICDF(27581), AOM_ICDF(30174),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1024), AOM_ICDF(2016), AOM_ICDF(28924), AOM_ICDF(30846),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(26310),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(13065), AOM_ICDF(26611),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(13065), AOM_ICDF(26611),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 },
 #if CONFIG_ALT_INTRA
-            { 1280, 5216, 6938, 13396, 32768, 0 }
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 }
 #endif
           },
-          { { 1024, 28800, 29792, 31280, 32768, 0 },
-            { 1280, 5216, 6938, 26310, 32768, 0 },
-            { 1280, 5216, 6938, 13396, 32768, 0 },
-            { 1152, 25852, 27581, 30174, 32768, 0 },
-            { 1024, 2016, 28924, 30846, 32768, 0 },
-            { 1280, 5216, 6938, 26310, 32768, 0 },
-            { 1280, 5216, 6938, 13396, 32768, 0 },
-            { 1280, 4109, 13065, 26611, 32768, 0 },
-            { 1280, 4109, 13065, 26611, 32768, 0 },
-            { 1280, 5216, 6938, 13396, 32768, 0 },
+          { { AOM_ICDF(1024), AOM_ICDF(28800), AOM_ICDF(29792), AOM_ICDF(31280),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(26310),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1152), AOM_ICDF(25852), AOM_ICDF(27581), AOM_ICDF(30174),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1024), AOM_ICDF(2016), AOM_ICDF(28924), AOM_ICDF(30846),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(26310),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(13065), AOM_ICDF(26611),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(13065), AOM_ICDF(26611),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 },
 #if CONFIG_ALT_INTRA
-            { 1280, 5216, 6938, 13396, 32768, 0 }
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 }
 #endif
           },
-          { { 1024, 28800, 29792, 31280, 32768, 0 },
-            { 1280, 5216, 6938, 26310, 32768, 0 },
-            { 1280, 5216, 6938, 13396, 32768, 0 },
-            { 1152, 25852, 27581, 30174, 32768, 0 },
-            { 1024, 2016, 28924, 30846, 32768, 0 },
-            { 1280, 5216, 6938, 26310, 32768, 0 },
-            { 1280, 5216, 6938, 13396, 32768, 0 },
-            { 1280, 4109, 13065, 26611, 32768, 0 },
-            { 1280, 4109, 13065, 26611, 32768, 0 },
-            { 1280, 5216, 6938, 13396, 32768, 0 },
+          { { AOM_ICDF(1024), AOM_ICDF(28800), AOM_ICDF(29792), AOM_ICDF(31280),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(26310),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1152), AOM_ICDF(25852), AOM_ICDF(27581), AOM_ICDF(30174),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1024), AOM_ICDF(2016), AOM_ICDF(28924), AOM_ICDF(30846),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(26310),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(13065), AOM_ICDF(26611),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(4109), AOM_ICDF(13065), AOM_ICDF(26611),
+              AOM_ICDF(32768), 0 },
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 },
 #if CONFIG_ALT_INTRA
-            { 1280, 5216, 6938, 13396, 32768, 0 }
+            { AOM_ICDF(1280), AOM_ICDF(5216), AOM_ICDF(6938), AOM_ICDF(13396),
+              AOM_ICDF(32768), 0 }
 #endif
           },
       }
@@ -2198,76 +2379,106 @@
 #if CONFIG_CB4X4
           { 0 },
 #endif
-          { 1280, 1453, 1626, 2277, 2929, 3580, 4232, 16717, 19225, 21733,
-            24241, 26749, 28253, 29758, 31263, 32768, 0 },
-          { 1280, 1453, 1626, 2277, 2929, 3580, 4232, 16717, 19225, 21733,
-            24241, 26749, 28253, 29758, 31263, 32768, 0 },
-          { 1280, 1453, 1626, 2277, 2929, 3580, 4232, 16717, 19225, 21733,
-            24241, 26749, 28253, 29758, 31263, 32768, 0 },
-          { 1280, 1453, 1626, 2277, 2929, 3580, 4232, 16717, 19225, 21733,
-            24241, 26749, 28253, 29758, 31263, 32768, 0 } },
+          { AOM_ICDF(1280), AOM_ICDF(1453), AOM_ICDF(1626), AOM_ICDF(2277),
+            AOM_ICDF(2929), AOM_ICDF(3580), AOM_ICDF(4232), AOM_ICDF(16717),
+            AOM_ICDF(19225), AOM_ICDF(21733), AOM_ICDF(24241), AOM_ICDF(26749),
+            AOM_ICDF(28253), AOM_ICDF(29758), AOM_ICDF(31263), AOM_ICDF(32768),
+            0 },
+          { AOM_ICDF(1280), AOM_ICDF(1453), AOM_ICDF(1626), AOM_ICDF(2277),
+            AOM_ICDF(2929), AOM_ICDF(3580), AOM_ICDF(4232), AOM_ICDF(16717),
+            AOM_ICDF(19225), AOM_ICDF(21733), AOM_ICDF(24241), AOM_ICDF(26749),
+            AOM_ICDF(28253), AOM_ICDF(29758), AOM_ICDF(31263), AOM_ICDF(32768),
+            0 },
+          { AOM_ICDF(1280), AOM_ICDF(1453), AOM_ICDF(1626), AOM_ICDF(2277),
+            AOM_ICDF(2929), AOM_ICDF(3580), AOM_ICDF(4232), AOM_ICDF(16717),
+            AOM_ICDF(19225), AOM_ICDF(21733), AOM_ICDF(24241), AOM_ICDF(26749),
+            AOM_ICDF(28253), AOM_ICDF(29758), AOM_ICDF(31263), AOM_ICDF(32768),
+            0 },
+          { AOM_ICDF(1280), AOM_ICDF(1453), AOM_ICDF(1626), AOM_ICDF(2277),
+            AOM_ICDF(2929), AOM_ICDF(3580), AOM_ICDF(4232), AOM_ICDF(16717),
+            AOM_ICDF(19225), AOM_ICDF(21733), AOM_ICDF(24241), AOM_ICDF(26749),
+            AOM_ICDF(28253), AOM_ICDF(29758), AOM_ICDF(31263), AOM_ICDF(32768),
+            0 } },
       {
 #if CONFIG_CB4X4
           { 0 },
 #endif
-          { 1280, 3125, 4970, 17132, 19575, 22018, 24461, 26904, 28370, 29836,
-            31302, 32768, 0 },
-          { 1280, 3125, 4970, 17132, 19575, 22018, 24461, 26904, 28370, 29836,
-            31302, 32768, 0 },
-          { 1280, 3125, 4970, 17132, 19575, 22018, 24461, 26904, 28370, 29836,
-            31302, 32768, 0 },
-          { 1280, 3125, 4970, 17132, 19575, 22018, 24461, 26904, 28370, 29836,
-            31302, 32768, 0 } },
+          { AOM_ICDF(1280), AOM_ICDF(3125), AOM_ICDF(4970), AOM_ICDF(17132),
+            AOM_ICDF(19575), AOM_ICDF(22018), AOM_ICDF(24461), AOM_ICDF(26904),
+            AOM_ICDF(28370), AOM_ICDF(29836), AOM_ICDF(31302), AOM_ICDF(32768),
+            0 },
+          { AOM_ICDF(1280), AOM_ICDF(3125), AOM_ICDF(4970), AOM_ICDF(17132),
+            AOM_ICDF(19575), AOM_ICDF(22018), AOM_ICDF(24461), AOM_ICDF(26904),
+            AOM_ICDF(28370), AOM_ICDF(29836), AOM_ICDF(31302), AOM_ICDF(32768),
+            0 },
+          { AOM_ICDF(1280), AOM_ICDF(3125), AOM_ICDF(4970), AOM_ICDF(17132),
+            AOM_ICDF(19575), AOM_ICDF(22018), AOM_ICDF(24461), AOM_ICDF(26904),
+            AOM_ICDF(28370), AOM_ICDF(29836), AOM_ICDF(31302), AOM_ICDF(32768),
+            0 },
+          { AOM_ICDF(1280), AOM_ICDF(3125), AOM_ICDF(4970), AOM_ICDF(17132),
+            AOM_ICDF(19575), AOM_ICDF(22018), AOM_ICDF(24461), AOM_ICDF(26904),
+            AOM_ICDF(28370), AOM_ICDF(29836), AOM_ICDF(31302), AOM_ICDF(32768),
+            0 } },
       {
 #if CONFIG_CB4X4
           { 0 },
 #endif
-          { 1536, 32768, 0 },
-          { 1536, 32768, 0 },
-          { 1536, 32768, 0 },
-          { 1536, 32768, 0 } }
+          { AOM_ICDF(1536), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(1536), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(1536), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(1536), AOM_ICDF(32768), 0 } }
     };
 #else
 static const aom_cdf_prob
     default_intra_ext_tx_cdf[EXT_TX_SIZES][TX_TYPES][CDF_SIZE(TX_TYPES)] = {
 #if CONFIG_CB4X4
-      { { 30720, 31400, 32084, 32768, 0 },
-        { 512, 638, 31764, 32768, 0 },
-        { 512, 638, 1642, 32768, 0 },
-        { 512, 31760, 32264, 32768, 0 } },
+      { { AOM_ICDF(30720), AOM_ICDF(31400), AOM_ICDF(32084), AOM_ICDF(32768),
+          0 },
+        { AOM_ICDF(512), AOM_ICDF(638), AOM_ICDF(31764), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(512), AOM_ICDF(638), AOM_ICDF(1642), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(512), AOM_ICDF(31760), AOM_ICDF(32264), AOM_ICDF(32768),
+          0 } },
 #endif
-      { { 30720, 31400, 32084, 32768, 0 },
-        { 512, 638, 31764, 32768, 0 },
-        { 512, 638, 1642, 32768, 0 },
-        { 512, 31760, 32264, 32768, 0 } },
+      { { AOM_ICDF(30720), AOM_ICDF(31400), AOM_ICDF(32084), AOM_ICDF(32768),
+          0 },
+        { AOM_ICDF(512), AOM_ICDF(638), AOM_ICDF(31764), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(512), AOM_ICDF(638), AOM_ICDF(1642), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(512), AOM_ICDF(31760), AOM_ICDF(32264), AOM_ICDF(32768),
+          0 } },
 
-      { { 31232, 31742, 32255, 32768, 0 },
-        { 1024, 1272, 31784, 32768, 0 },
-        { 1024, 1272, 2256, 32768, 0 },
-        { 1024, 31776, 32272, 32768, 0 } },
-      { { 31744, 32084, 32426, 32768, 0 },
-        { 2048, 2528, 31823, 32768, 0 },
-        { 2048, 2528, 3473, 32768, 0 },
-        { 2048, 31808, 32288, 32768, 0 } },
+      { { AOM_ICDF(31232), AOM_ICDF(31742), AOM_ICDF(32255), AOM_ICDF(32768),
+          0 },
+        { AOM_ICDF(1024), AOM_ICDF(1272), AOM_ICDF(31784), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(1024), AOM_ICDF(1272), AOM_ICDF(2256), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(1024), AOM_ICDF(31776), AOM_ICDF(32272), AOM_ICDF(32768),
+          0 } },
+      { { AOM_ICDF(31744), AOM_ICDF(32084), AOM_ICDF(32426), AOM_ICDF(32768),
+          0 },
+        { AOM_ICDF(2048), AOM_ICDF(2528), AOM_ICDF(31823), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(2048), AOM_ICDF(2528), AOM_ICDF(3473), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(2048), AOM_ICDF(31808), AOM_ICDF(32288), AOM_ICDF(32768),
+          0 } },
     };
 
 static const aom_cdf_prob
     default_inter_ext_tx_cdf[EXT_TX_SIZES][CDF_SIZE(TX_TYPES)] = {
 #if CONFIG_CB4X4
-      { 20480, 24560, 28664, 32768, 0 },
+      { AOM_ICDF(20480), AOM_ICDF(24560), AOM_ICDF(28664), AOM_ICDF(32768), 0 },
 #endif
-      { 20480, 24560, 28664, 32768, 0 },
-      { 22528, 25928, 29348, 32768, 0 },
-      { 24576, 27296, 30032, 32768, 0 },
+      { AOM_ICDF(20480), AOM_ICDF(24560), AOM_ICDF(28664), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(22528), AOM_ICDF(25928), AOM_ICDF(29348), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(24576), AOM_ICDF(27296), AOM_ICDF(30032), AOM_ICDF(32768), 0 },
     };
 #endif  // !CONFIG_EXT_TX
 
 #if CONFIG_EXT_INTRA && CONFIG_INTRA_INTERP
 static const aom_cdf_prob
     default_intra_filter_cdf[INTRA_FILTERS + 1][CDF_SIZE(INTRA_FILTERS)] = {
-      { 12544, 17521, 21095, 32768, 0 }, { 12544, 19022, 23318, 32768, 0 },
-      { 12032, 17297, 23522, 32768, 0 }, { 6272, 8860, 11101, 32768, 0 },
-      { 9216, 12712, 16629, 32768, 0 },
+      { AOM_ICDF(12544), AOM_ICDF(17521), AOM_ICDF(21095), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(12544), AOM_ICDF(19022), AOM_ICDF(23318), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(12032), AOM_ICDF(17297), AOM_ICDF(23522), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(6272), AOM_ICDF(8860), AOM_ICDF(11101), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(9216), AOM_ICDF(12712), AOM_ICDF(16629), AOM_ICDF(32768), 0 },
     };
 #endif  // CONFIG_EXT_INTRA && CONFIG_INTRA_INTERP
 
@@ -2276,470 +2487,691 @@
     av1_kf_y_mode_cdf[INTRA_MODES][INTRA_MODES][CDF_SIZE(INTRA_MODES)] = {
 #if CONFIG_ALT_INTRA
       {
-          { 15488, 17513, 20731, 24586, 25921, 26749, 27807, 28602, 29530,
-            30681, 32768, 0 },
-          { 11648, 14783, 21879, 23981, 25213, 26218, 27472, 28465, 29221,
-            30232, 32768, 0 },
-          { 8448, 11108, 13392, 25167, 26295, 26789, 27536, 28088, 29039, 30700,
-            32768, 0 },
-          { 13568, 15293, 18706, 21610, 23139, 24254, 26383, 27630, 28613,
-            30350, 32768, 0 },
-          { 9600, 11772, 14397, 16580, 20091, 22865, 24490, 25395, 27037, 28694,
-            32768, 0 },
-          { 12160, 14092, 17010, 18922, 22683, 25751, 27725, 30109, 31449,
-            32763, 32768, 0 },
-          { 9088, 10383, 12569, 17113, 21351, 22511, 23633, 24382, 28215, 29798,
-            32768, 0 },
-          { 10880, 12248, 15214, 20017, 21922, 22757, 24360, 25280, 26684,
-            29869, 32768, 0 },
-          { 11008, 13133, 15587, 17872, 19579, 21157, 23788, 26629, 27732,
-            29601, 32768, 0 },
-          { 10112, 12325, 15360, 18348, 20452, 20460, 21902, 23982, 25149,
-            26667, 32768, 0 },
-          { 8704, 14250, 17722, 23128, 24217, 24892, 26215, 27392, 28358, 30287,
-            32768, 0 },
+          { AOM_ICDF(15488), AOM_ICDF(17513), AOM_ICDF(20731), AOM_ICDF(24586),
+            AOM_ICDF(25921), AOM_ICDF(26749), AOM_ICDF(27807), AOM_ICDF(28602),
+            AOM_ICDF(29530), AOM_ICDF(30681), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(11648), AOM_ICDF(14783), AOM_ICDF(21879), AOM_ICDF(23981),
+            AOM_ICDF(25213), AOM_ICDF(26218), AOM_ICDF(27472), AOM_ICDF(28465),
+            AOM_ICDF(29221), AOM_ICDF(30232), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8448), AOM_ICDF(11108), AOM_ICDF(13392), AOM_ICDF(25167),
+            AOM_ICDF(26295), AOM_ICDF(26789), AOM_ICDF(27536), AOM_ICDF(28088),
+            AOM_ICDF(29039), AOM_ICDF(30700), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(13568), AOM_ICDF(15293), AOM_ICDF(18706), AOM_ICDF(21610),
+            AOM_ICDF(23139), AOM_ICDF(24254), AOM_ICDF(26383), AOM_ICDF(27630),
+            AOM_ICDF(28613), AOM_ICDF(30350), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9600), AOM_ICDF(11772), AOM_ICDF(14397), AOM_ICDF(16580),
+            AOM_ICDF(20091), AOM_ICDF(22865), AOM_ICDF(24490), AOM_ICDF(25395),
+            AOM_ICDF(27037), AOM_ICDF(28694), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(12160), AOM_ICDF(14092), AOM_ICDF(17010), AOM_ICDF(18922),
+            AOM_ICDF(22683), AOM_ICDF(25751), AOM_ICDF(27725), AOM_ICDF(30109),
+            AOM_ICDF(31449), AOM_ICDF(32763), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9088), AOM_ICDF(10383), AOM_ICDF(12569), AOM_ICDF(17113),
+            AOM_ICDF(21351), AOM_ICDF(22511), AOM_ICDF(23633), AOM_ICDF(24382),
+            AOM_ICDF(28215), AOM_ICDF(29798), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10880), AOM_ICDF(12248), AOM_ICDF(15214), AOM_ICDF(20017),
+            AOM_ICDF(21922), AOM_ICDF(22757), AOM_ICDF(24360), AOM_ICDF(25280),
+            AOM_ICDF(26684), AOM_ICDF(29869), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(11008), AOM_ICDF(13133), AOM_ICDF(15587), AOM_ICDF(17872),
+            AOM_ICDF(19579), AOM_ICDF(21157), AOM_ICDF(23788), AOM_ICDF(26629),
+            AOM_ICDF(27732), AOM_ICDF(29601), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10112), AOM_ICDF(12325), AOM_ICDF(15360), AOM_ICDF(18348),
+            AOM_ICDF(20452), AOM_ICDF(20460), AOM_ICDF(21902), AOM_ICDF(23982),
+            AOM_ICDF(25149), AOM_ICDF(26667), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8704), AOM_ICDF(14250), AOM_ICDF(17722), AOM_ICDF(23128),
+            AOM_ICDF(24217), AOM_ICDF(24892), AOM_ICDF(26215), AOM_ICDF(27392),
+            AOM_ICDF(28358), AOM_ICDF(30287), AOM_ICDF(32768), 0 },
       },
       {
-          { 8448, 10443, 20733, 23689, 24634, 25951, 26670, 27861, 28379, 29305,
-            32768, 0 },
-          { 6656, 9206, 24577, 25792, 26335, 27169, 27913, 28956, 29239, 29680,
-            32768, 0 },
-          { 7168, 8968, 15662, 22937, 23849, 24616, 25603, 26555, 27210, 29142,
-            32768, 0 },
-          { 9600, 11501, 19310, 21731, 22790, 23936, 25627, 27217, 27868, 29170,
-            32768, 0 },
-          { 6912, 8730, 17650, 19377, 21025, 23319, 24537, 26112, 26840, 28345,
-            32768, 0 },
-          { 7808, 9661, 20583, 21996, 23898, 26818, 28120, 30716, 31678, 32764,
-            32768, 0 },
-          { 6784, 8104, 15619, 18584, 20844, 22519, 23760, 25203, 27094, 28801,
-            32768, 0 },
-          { 8832, 10141, 17035, 20764, 21703, 22751, 23964, 25305, 26034, 29006,
-            32768, 0 },
-          { 8192, 9920, 19113, 20594, 21747, 23327, 24581, 26916, 27533, 28944,
-            32768, 0 },
-          { 6656, 8696, 18381, 20537, 21804, 21809, 22751, 24394, 24917, 25990,
-            32768, 0 },
-          { 6400, 9593, 20818, 23519, 24266, 25113, 26608, 27883, 28322, 29364,
-            32768, 0 },
+          { AOM_ICDF(8448), AOM_ICDF(10443), AOM_ICDF(20733), AOM_ICDF(23689),
+            AOM_ICDF(24634), AOM_ICDF(25951), AOM_ICDF(26670), AOM_ICDF(27861),
+            AOM_ICDF(28379), AOM_ICDF(29305), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6656), AOM_ICDF(9206), AOM_ICDF(24577), AOM_ICDF(25792),
+            AOM_ICDF(26335), AOM_ICDF(27169), AOM_ICDF(27913), AOM_ICDF(28956),
+            AOM_ICDF(29239), AOM_ICDF(29680), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(7168), AOM_ICDF(8968), AOM_ICDF(15662), AOM_ICDF(22937),
+            AOM_ICDF(23849), AOM_ICDF(24616), AOM_ICDF(25603), AOM_ICDF(26555),
+            AOM_ICDF(27210), AOM_ICDF(29142), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9600), AOM_ICDF(11501), AOM_ICDF(19310), AOM_ICDF(21731),
+            AOM_ICDF(22790), AOM_ICDF(23936), AOM_ICDF(25627), AOM_ICDF(27217),
+            AOM_ICDF(27868), AOM_ICDF(29170), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6912), AOM_ICDF(8730), AOM_ICDF(17650), AOM_ICDF(19377),
+            AOM_ICDF(21025), AOM_ICDF(23319), AOM_ICDF(24537), AOM_ICDF(26112),
+            AOM_ICDF(26840), AOM_ICDF(28345), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(7808), AOM_ICDF(9661), AOM_ICDF(20583), AOM_ICDF(21996),
+            AOM_ICDF(23898), AOM_ICDF(26818), AOM_ICDF(28120), AOM_ICDF(30716),
+            AOM_ICDF(31678), AOM_ICDF(32764), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6784), AOM_ICDF(8104), AOM_ICDF(15619), AOM_ICDF(18584),
+            AOM_ICDF(20844), AOM_ICDF(22519), AOM_ICDF(23760), AOM_ICDF(25203),
+            AOM_ICDF(27094), AOM_ICDF(28801), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8832), AOM_ICDF(10141), AOM_ICDF(17035), AOM_ICDF(20764),
+            AOM_ICDF(21703), AOM_ICDF(22751), AOM_ICDF(23964), AOM_ICDF(25305),
+            AOM_ICDF(26034), AOM_ICDF(29006), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8192), AOM_ICDF(9920), AOM_ICDF(19113), AOM_ICDF(20594),
+            AOM_ICDF(21747), AOM_ICDF(23327), AOM_ICDF(24581), AOM_ICDF(26916),
+            AOM_ICDF(27533), AOM_ICDF(28944), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6656), AOM_ICDF(8696), AOM_ICDF(18381), AOM_ICDF(20537),
+            AOM_ICDF(21804), AOM_ICDF(21809), AOM_ICDF(22751), AOM_ICDF(24394),
+            AOM_ICDF(24917), AOM_ICDF(25990), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6400), AOM_ICDF(9593), AOM_ICDF(20818), AOM_ICDF(23519),
+            AOM_ICDF(24266), AOM_ICDF(25113), AOM_ICDF(26608), AOM_ICDF(27883),
+            AOM_ICDF(28322), AOM_ICDF(29364), AOM_ICDF(32768), 0 },
       },
       {
-          { 12032, 14381, 16608, 24946, 26084, 26582, 27428, 28075, 29395,
-            30858, 32768, 0 },
-          { 9216, 12620, 18287, 24345, 25984, 26715, 27732, 28519, 29399, 30781,
-            32768, 0 },
-          { 6784, 8916, 10220, 26539, 27310, 27483, 28082, 28430, 29362, 31291,
-            32768, 0 },
-          { 11904, 14838, 17359, 21663, 22931, 23619, 25620, 26653, 27823,
-            30547, 32768, 0 },
-          { 10752, 13504, 15536, 19057, 21753, 23883, 25202, 26266, 28196,
-            30589, 32768, 0 },
-          { 10496, 13193, 16787, 21011, 23929, 25651, 27958, 29330, 31022,
-            32761, 32768, 0 },
-          { 8448, 9968, 11749, 18062, 21841, 22669, 23852, 24444, 28118, 30007,
-            32768, 0 },
-          { 9728, 11168, 12602, 20819, 22194, 22764, 24366, 25022, 26414, 30460,
-            32768, 0 },
-          { 9216, 12712, 14357, 18346, 20486, 21549, 23170, 25794, 27129, 29574,
-            32768, 0 },
-          { 7808, 10733, 13057, 20252, 21906, 21912, 23057, 24233, 25700, 27439,
-            32768, 0 },
-          { 6784, 11352, 13778, 23877, 24995, 25424, 26830, 27688, 28779, 30368,
-            32768, 0 },
+          { AOM_ICDF(12032), AOM_ICDF(14381), AOM_ICDF(16608), AOM_ICDF(24946),
+            AOM_ICDF(26084), AOM_ICDF(26582), AOM_ICDF(27428), AOM_ICDF(28075),
+            AOM_ICDF(29395), AOM_ICDF(30858), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9216), AOM_ICDF(12620), AOM_ICDF(18287), AOM_ICDF(24345),
+            AOM_ICDF(25984), AOM_ICDF(26715), AOM_ICDF(27732), AOM_ICDF(28519),
+            AOM_ICDF(29399), AOM_ICDF(30781), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6784), AOM_ICDF(8916), AOM_ICDF(10220), AOM_ICDF(26539),
+            AOM_ICDF(27310), AOM_ICDF(27483), AOM_ICDF(28082), AOM_ICDF(28430),
+            AOM_ICDF(29362), AOM_ICDF(31291), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(11904), AOM_ICDF(14838), AOM_ICDF(17359), AOM_ICDF(21663),
+            AOM_ICDF(22931), AOM_ICDF(23619), AOM_ICDF(25620), AOM_ICDF(26653),
+            AOM_ICDF(27823), AOM_ICDF(30547), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10752), AOM_ICDF(13504), AOM_ICDF(15536), AOM_ICDF(19057),
+            AOM_ICDF(21753), AOM_ICDF(23883), AOM_ICDF(25202), AOM_ICDF(26266),
+            AOM_ICDF(28196), AOM_ICDF(30589), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10496), AOM_ICDF(13193), AOM_ICDF(16787), AOM_ICDF(21011),
+            AOM_ICDF(23929), AOM_ICDF(25651), AOM_ICDF(27958), AOM_ICDF(29330),
+            AOM_ICDF(31022), AOM_ICDF(32761), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8448), AOM_ICDF(9968), AOM_ICDF(11749), AOM_ICDF(18062),
+            AOM_ICDF(21841), AOM_ICDF(22669), AOM_ICDF(23852), AOM_ICDF(24444),
+            AOM_ICDF(28118), AOM_ICDF(30007), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9728), AOM_ICDF(11168), AOM_ICDF(12602), AOM_ICDF(20819),
+            AOM_ICDF(22194), AOM_ICDF(22764), AOM_ICDF(24366), AOM_ICDF(25022),
+            AOM_ICDF(26414), AOM_ICDF(30460), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9216), AOM_ICDF(12712), AOM_ICDF(14357), AOM_ICDF(18346),
+            AOM_ICDF(20486), AOM_ICDF(21549), AOM_ICDF(23170), AOM_ICDF(25794),
+            AOM_ICDF(27129), AOM_ICDF(29574), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(7808), AOM_ICDF(10733), AOM_ICDF(13057), AOM_ICDF(20252),
+            AOM_ICDF(21906), AOM_ICDF(21912), AOM_ICDF(23057), AOM_ICDF(24233),
+            AOM_ICDF(25700), AOM_ICDF(27439), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6784), AOM_ICDF(11352), AOM_ICDF(13778), AOM_ICDF(23877),
+            AOM_ICDF(24995), AOM_ICDF(25424), AOM_ICDF(26830), AOM_ICDF(27688),
+            AOM_ICDF(28779), AOM_ICDF(30368), AOM_ICDF(32768), 0 },
       },
       {
-          { 12288, 13728, 16480, 19841, 21570, 22715, 25385, 27000, 28329,
-            29994, 32768, 0 },
-          { 9344, 10991, 18817, 20972, 22137, 23231, 26025, 27711, 28244, 29428,
-            32768, 0 },
-          { 9344, 10900, 13206, 21344, 22332, 22987, 25127, 26440, 27231, 29502,
-            32768, 0 },
-          { 12928, 14478, 15978, 18630, 19852, 20897, 24699, 26464, 27030,
-            30482, 32768, 0 },
-          { 9088, 10476, 13350, 15237, 18175, 20252, 23283, 25321, 26426, 29349,
-            32768, 0 },
-          { 10240, 11912, 15008, 17177, 19979, 23056, 26395, 29681, 30790,
-            32760, 32768, 0 },
-          { 8704, 9738, 11717, 15480, 18656, 20022, 22611, 24357, 27150, 29257,
-            32768, 0 },
-          { 12928, 13548, 17978, 20602, 21814, 22427, 24568, 25881, 26823,
-            30817, 32768, 0 },
-          { 10496, 12149, 14082, 18054, 19032, 19994, 24086, 28427, 29156,
-            30680, 32768, 0 },
-          { 8448, 10158, 13867, 16506, 18584, 18592, 21472, 23767, 24646, 27279,
-            32768, 0 },
-          { 7296, 9684, 13471, 17701, 18934, 19878, 25115, 27238, 27972, 29583,
-            32768, 0 },
+          { AOM_ICDF(12288), AOM_ICDF(13728), AOM_ICDF(16480), AOM_ICDF(19841),
+            AOM_ICDF(21570), AOM_ICDF(22715), AOM_ICDF(25385), AOM_ICDF(27000),
+            AOM_ICDF(28329), AOM_ICDF(29994), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9344), AOM_ICDF(10991), AOM_ICDF(18817), AOM_ICDF(20972),
+            AOM_ICDF(22137), AOM_ICDF(23231), AOM_ICDF(26025), AOM_ICDF(27711),
+            AOM_ICDF(28244), AOM_ICDF(29428), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9344), AOM_ICDF(10900), AOM_ICDF(13206), AOM_ICDF(21344),
+            AOM_ICDF(22332), AOM_ICDF(22987), AOM_ICDF(25127), AOM_ICDF(26440),
+            AOM_ICDF(27231), AOM_ICDF(29502), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(12928), AOM_ICDF(14478), AOM_ICDF(15978), AOM_ICDF(18630),
+            AOM_ICDF(19852), AOM_ICDF(20897), AOM_ICDF(24699), AOM_ICDF(26464),
+            AOM_ICDF(27030), AOM_ICDF(30482), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9088), AOM_ICDF(10476), AOM_ICDF(13350), AOM_ICDF(15237),
+            AOM_ICDF(18175), AOM_ICDF(20252), AOM_ICDF(23283), AOM_ICDF(25321),
+            AOM_ICDF(26426), AOM_ICDF(29349), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10240), AOM_ICDF(11912), AOM_ICDF(15008), AOM_ICDF(17177),
+            AOM_ICDF(19979), AOM_ICDF(23056), AOM_ICDF(26395), AOM_ICDF(29681),
+            AOM_ICDF(30790), AOM_ICDF(32760), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8704), AOM_ICDF(9738), AOM_ICDF(11717), AOM_ICDF(15480),
+            AOM_ICDF(18656), AOM_ICDF(20022), AOM_ICDF(22611), AOM_ICDF(24357),
+            AOM_ICDF(27150), AOM_ICDF(29257), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(12928), AOM_ICDF(13548), AOM_ICDF(17978), AOM_ICDF(20602),
+            AOM_ICDF(21814), AOM_ICDF(22427), AOM_ICDF(24568), AOM_ICDF(25881),
+            AOM_ICDF(26823), AOM_ICDF(30817), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10496), AOM_ICDF(12149), AOM_ICDF(14082), AOM_ICDF(18054),
+            AOM_ICDF(19032), AOM_ICDF(19994), AOM_ICDF(24086), AOM_ICDF(28427),
+            AOM_ICDF(29156), AOM_ICDF(30680), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8448), AOM_ICDF(10158), AOM_ICDF(13867), AOM_ICDF(16506),
+            AOM_ICDF(18584), AOM_ICDF(18592), AOM_ICDF(21472), AOM_ICDF(23767),
+            AOM_ICDF(24646), AOM_ICDF(27279), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(7296), AOM_ICDF(9684), AOM_ICDF(13471), AOM_ICDF(17701),
+            AOM_ICDF(18934), AOM_ICDF(19878), AOM_ICDF(25115), AOM_ICDF(27238),
+            AOM_ICDF(27972), AOM_ICDF(29583), AOM_ICDF(32768), 0 },
       },
       {
-          { 10880, 12163, 14497, 17112, 20859, 22562, 23599, 24638, 26861,
-            29399, 32768, 0 },
-          { 9984, 12476, 16360, 18889, 21414, 23474, 24563, 25909, 27195, 28828,
-            32768, 0 },
-          { 7168, 9268, 10737, 20063, 22315, 23302, 24152, 25195, 26645, 28845,
-            32768, 0 },
-          { 8960, 10727, 12449, 14263, 16523, 17608, 23352, 24676, 26478, 28886,
-            32768, 0 },
-          { 9856, 11109, 13309, 14975, 19055, 21670, 23144, 24460, 26212, 28107,
-            32768, 0 },
-          { 9984, 11586, 14565, 16562, 21107, 25444, 27218, 29429, 31451, 32763,
-            32768, 0 },
-          { 7168, 8268, 9704, 13144, 18443, 20065, 21653, 23607, 26506, 28854,
-            32768, 0 },
-          { 11520, 13014, 14866, 18136, 20231, 21509, 23004, 24186, 25728,
-            29468, 32768, 0 },
-          { 10240, 12264, 14507, 16388, 18888, 20927, 22731, 24691, 26142,
-            28394, 32768, 0 },
-          { 8064, 10187, 12921, 15952, 19960, 19976, 21275, 23205, 25110, 26636,
-            32768, 0 },
-          { 8448, 11488, 14065, 19113, 21604, 22978, 24508, 25895, 27398, 29055,
-            32768, 0 },
+          { AOM_ICDF(10880), AOM_ICDF(12163), AOM_ICDF(14497), AOM_ICDF(17112),
+            AOM_ICDF(20859), AOM_ICDF(22562), AOM_ICDF(23599), AOM_ICDF(24638),
+            AOM_ICDF(26861), AOM_ICDF(29399), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9984), AOM_ICDF(12476), AOM_ICDF(16360), AOM_ICDF(18889),
+            AOM_ICDF(21414), AOM_ICDF(23474), AOM_ICDF(24563), AOM_ICDF(25909),
+            AOM_ICDF(27195), AOM_ICDF(28828), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(7168), AOM_ICDF(9268), AOM_ICDF(10737), AOM_ICDF(20063),
+            AOM_ICDF(22315), AOM_ICDF(23302), AOM_ICDF(24152), AOM_ICDF(25195),
+            AOM_ICDF(26645), AOM_ICDF(28845), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8960), AOM_ICDF(10727), AOM_ICDF(12449), AOM_ICDF(14263),
+            AOM_ICDF(16523), AOM_ICDF(17608), AOM_ICDF(23352), AOM_ICDF(24676),
+            AOM_ICDF(26478), AOM_ICDF(28886), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9856), AOM_ICDF(11109), AOM_ICDF(13309), AOM_ICDF(14975),
+            AOM_ICDF(19055), AOM_ICDF(21670), AOM_ICDF(23144), AOM_ICDF(24460),
+            AOM_ICDF(26212), AOM_ICDF(28107), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9984), AOM_ICDF(11586), AOM_ICDF(14565), AOM_ICDF(16562),
+            AOM_ICDF(21107), AOM_ICDF(25444), AOM_ICDF(27218), AOM_ICDF(29429),
+            AOM_ICDF(31451), AOM_ICDF(32763), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(7168), AOM_ICDF(8268), AOM_ICDF(9704), AOM_ICDF(13144),
+            AOM_ICDF(18443), AOM_ICDF(20065), AOM_ICDF(21653), AOM_ICDF(23607),
+            AOM_ICDF(26506), AOM_ICDF(28854), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(11520), AOM_ICDF(13014), AOM_ICDF(14866), AOM_ICDF(18136),
+            AOM_ICDF(20231), AOM_ICDF(21509), AOM_ICDF(23004), AOM_ICDF(24186),
+            AOM_ICDF(25728), AOM_ICDF(29468), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10240), AOM_ICDF(12264), AOM_ICDF(14507), AOM_ICDF(16388),
+            AOM_ICDF(18888), AOM_ICDF(20927), AOM_ICDF(22731), AOM_ICDF(24691),
+            AOM_ICDF(26142), AOM_ICDF(28394), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8064), AOM_ICDF(10187), AOM_ICDF(12921), AOM_ICDF(15952),
+            AOM_ICDF(19960), AOM_ICDF(19976), AOM_ICDF(21275), AOM_ICDF(23205),
+            AOM_ICDF(25110), AOM_ICDF(26636), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8448), AOM_ICDF(11488), AOM_ICDF(14065), AOM_ICDF(19113),
+            AOM_ICDF(21604), AOM_ICDF(22978), AOM_ICDF(24508), AOM_ICDF(25895),
+            AOM_ICDF(27398), AOM_ICDF(29055), AOM_ICDF(32768), 0 },
       },
       {
-          { 10368, 11768, 16772, 19842, 22940, 27394, 28528, 30267, 31371,
-            32763, 32768, 0 },
-          { 9472, 11292, 18507, 20777, 23357, 27587, 28902, 30850, 31607, 32763,
-            32768, 0 },
-          { 8064, 9512, 13782, 20645, 24493, 26242, 28001, 29435, 30438, 32759,
-            32768, 0 },
-          { 8960, 10541, 15664, 17639, 19646, 22145, 25216, 28815, 30050, 32757,
-            32768, 0 },
-          { 9984, 11141, 15365, 16746, 21186, 25766, 27817, 30022, 31309, 32762,
-            32768, 0 },
-          { 9216, 10688, 16639, 17735, 21499, 26657, 28161, 30572, 31490, 32763,
-            32768, 0 },
-          { 8448, 9303, 13611, 16636, 20555, 23414, 24912, 27613, 29727, 32756,
-            32768, 0 },
-          { 9984, 11052, 16142, 19312, 21680, 23870, 25504, 28200, 29324, 32755,
-            32768, 0 },
-          { 10496, 12323, 16955, 18839, 21144, 24861, 26838, 29988, 30976,
-            32761, 32768, 0 },
-          { 2944, 5973, 8904, 11875, 14864, 17853, 20824, 23810, 26784, 29776,
-            32768, 0 },
-          { 7424, 10097, 15588, 20217, 23899, 26460, 28308, 30155, 30951, 32761,
-            32768, 0 },
+          { AOM_ICDF(10368), AOM_ICDF(11768), AOM_ICDF(16772), AOM_ICDF(19842),
+            AOM_ICDF(22940), AOM_ICDF(27394), AOM_ICDF(28528), AOM_ICDF(30267),
+            AOM_ICDF(31371), AOM_ICDF(32763), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9472), AOM_ICDF(11292), AOM_ICDF(18507), AOM_ICDF(20777),
+            AOM_ICDF(23357), AOM_ICDF(27587), AOM_ICDF(28902), AOM_ICDF(30850),
+            AOM_ICDF(31607), AOM_ICDF(32763), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8064), AOM_ICDF(9512), AOM_ICDF(13782), AOM_ICDF(20645),
+            AOM_ICDF(24493), AOM_ICDF(26242), AOM_ICDF(28001), AOM_ICDF(29435),
+            AOM_ICDF(30438), AOM_ICDF(32759), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8960), AOM_ICDF(10541), AOM_ICDF(15664), AOM_ICDF(17639),
+            AOM_ICDF(19646), AOM_ICDF(22145), AOM_ICDF(25216), AOM_ICDF(28815),
+            AOM_ICDF(30050), AOM_ICDF(32757), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9984), AOM_ICDF(11141), AOM_ICDF(15365), AOM_ICDF(16746),
+            AOM_ICDF(21186), AOM_ICDF(25766), AOM_ICDF(27817), AOM_ICDF(30022),
+            AOM_ICDF(31309), AOM_ICDF(32762), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9216), AOM_ICDF(10688), AOM_ICDF(16639), AOM_ICDF(17735),
+            AOM_ICDF(21499), AOM_ICDF(26657), AOM_ICDF(28161), AOM_ICDF(30572),
+            AOM_ICDF(31490), AOM_ICDF(32763), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8448), AOM_ICDF(9303), AOM_ICDF(13611), AOM_ICDF(16636),
+            AOM_ICDF(20555), AOM_ICDF(23414), AOM_ICDF(24912), AOM_ICDF(27613),
+            AOM_ICDF(29727), AOM_ICDF(32756), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9984), AOM_ICDF(11052), AOM_ICDF(16142), AOM_ICDF(19312),
+            AOM_ICDF(21680), AOM_ICDF(23870), AOM_ICDF(25504), AOM_ICDF(28200),
+            AOM_ICDF(29324), AOM_ICDF(32755), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10496), AOM_ICDF(12323), AOM_ICDF(16955), AOM_ICDF(18839),
+            AOM_ICDF(21144), AOM_ICDF(24861), AOM_ICDF(26838), AOM_ICDF(29988),
+            AOM_ICDF(30976), AOM_ICDF(32761), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(2944), AOM_ICDF(5973), AOM_ICDF(8904), AOM_ICDF(11875),
+            AOM_ICDF(14864), AOM_ICDF(17853), AOM_ICDF(20824), AOM_ICDF(23810),
+            AOM_ICDF(26784), AOM_ICDF(29776), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(7424), AOM_ICDF(10097), AOM_ICDF(15588), AOM_ICDF(20217),
+            AOM_ICDF(23899), AOM_ICDF(26460), AOM_ICDF(28308), AOM_ICDF(30155),
+            AOM_ICDF(30951), AOM_ICDF(32761), AOM_ICDF(32768), 0 },
       },
       {
-          { 11648, 13133, 15050, 20481, 22470, 23425, 24337, 25160, 28964,
-            30480, 32768, 0 },
-          { 10240, 12616, 16631, 20485, 22290, 23628, 25235, 26353, 28107,
-            29655, 32768, 0 },
-          { 6784, 8002, 9066, 20038, 22926, 23324, 23951, 24537, 26916, 30231,
-            32768, 0 },
-          { 11904, 14105, 15782, 19896, 22283, 23147, 24763, 25983, 27812,
-            29980, 32768, 0 },
-          { 10624, 11922, 13632, 15941, 20469, 22453, 24065, 25187, 27349,
-            29296, 32768, 0 },
-          { 12032, 13085, 15468, 17768, 20613, 24388, 26385, 28430, 30938,
-            32761, 32768, 0 },
-          { 9728, 10538, 11493, 14765, 18460, 19471, 20302, 20935, 28192, 29926,
-            32768, 0 },
-          { 8960, 9890, 10962, 16685, 18880, 19480, 20674, 21477, 23815, 29341,
-            32768, 0 },
-          { 14592, 16367, 17712, 20293, 22544, 23829, 24877, 26326, 27660,
-            29875, 32768, 0 },
-          { 8960, 10448, 12279, 16206, 18672, 18682, 20058, 21547, 25097, 27165,
-            32768, 0 },
-          { 11136, 13840, 15762, 21710, 23038, 23734, 24863, 25882, 27765,
-            30071, 32768, 0 },
+          { AOM_ICDF(11648), AOM_ICDF(13133), AOM_ICDF(15050), AOM_ICDF(20481),
+            AOM_ICDF(22470), AOM_ICDF(23425), AOM_ICDF(24337), AOM_ICDF(25160),
+            AOM_ICDF(28964), AOM_ICDF(30480), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10240), AOM_ICDF(12616), AOM_ICDF(16631), AOM_ICDF(20485),
+            AOM_ICDF(22290), AOM_ICDF(23628), AOM_ICDF(25235), AOM_ICDF(26353),
+            AOM_ICDF(28107), AOM_ICDF(29655), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6784), AOM_ICDF(8002), AOM_ICDF(9066), AOM_ICDF(20038),
+            AOM_ICDF(22926), AOM_ICDF(23324), AOM_ICDF(23951), AOM_ICDF(24537),
+            AOM_ICDF(26916), AOM_ICDF(30231), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(11904), AOM_ICDF(14105), AOM_ICDF(15782), AOM_ICDF(19896),
+            AOM_ICDF(22283), AOM_ICDF(23147), AOM_ICDF(24763), AOM_ICDF(25983),
+            AOM_ICDF(27812), AOM_ICDF(29980), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10624), AOM_ICDF(11922), AOM_ICDF(13632), AOM_ICDF(15941),
+            AOM_ICDF(20469), AOM_ICDF(22453), AOM_ICDF(24065), AOM_ICDF(25187),
+            AOM_ICDF(27349), AOM_ICDF(29296), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(12032), AOM_ICDF(13085), AOM_ICDF(15468), AOM_ICDF(17768),
+            AOM_ICDF(20613), AOM_ICDF(24388), AOM_ICDF(26385), AOM_ICDF(28430),
+            AOM_ICDF(30938), AOM_ICDF(32761), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9728), AOM_ICDF(10538), AOM_ICDF(11493), AOM_ICDF(14765),
+            AOM_ICDF(18460), AOM_ICDF(19471), AOM_ICDF(20302), AOM_ICDF(20935),
+            AOM_ICDF(28192), AOM_ICDF(29926), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8960), AOM_ICDF(9890), AOM_ICDF(10962), AOM_ICDF(16685),
+            AOM_ICDF(18880), AOM_ICDF(19480), AOM_ICDF(20674), AOM_ICDF(21477),
+            AOM_ICDF(23815), AOM_ICDF(29341), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(14592), AOM_ICDF(16367), AOM_ICDF(17712), AOM_ICDF(20293),
+            AOM_ICDF(22544), AOM_ICDF(23829), AOM_ICDF(24877), AOM_ICDF(26326),
+            AOM_ICDF(27660), AOM_ICDF(29875), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8960), AOM_ICDF(10448), AOM_ICDF(12279), AOM_ICDF(16206),
+            AOM_ICDF(18672), AOM_ICDF(18682), AOM_ICDF(20058), AOM_ICDF(21547),
+            AOM_ICDF(25097), AOM_ICDF(27165), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(11136), AOM_ICDF(13840), AOM_ICDF(15762), AOM_ICDF(21710),
+            AOM_ICDF(23038), AOM_ICDF(23734), AOM_ICDF(24863), AOM_ICDF(25882),
+            AOM_ICDF(27765), AOM_ICDF(30071), AOM_ICDF(32768), 0 },
       },
       {
-          { 12544, 14124, 16964, 21907, 23808, 24496, 25724, 26715, 27992,
-            30455, 32768, 0 },
-          { 10368, 13606, 18247, 20869, 22590, 23749, 25088, 26378, 27277,
-            29808, 32768, 0 },
-          { 9088, 11031, 12899, 23497, 24465, 24851, 25995, 26815, 27885, 30555,
-            32768, 0 },
-          { 11520, 14342, 15710, 19196, 21250, 21907, 24665, 26153, 27212,
-            30750, 32768, 0 },
-          { 9984, 11764, 13979, 16405, 19279, 20658, 23354, 25266, 26702, 29380,
-            32768, 0 },
-          { 10112, 12325, 15918, 19060, 21829, 23882, 26277, 27697, 30114,
-            32758, 32768, 0 },
-          { 9344, 10534, 12184, 16208, 19764, 20627, 22524, 23644, 26887, 29782,
-            32768, 0 },
-          { 12928, 14013, 15625, 19107, 20654, 21451, 22910, 23873, 24776,
-            30239, 32768, 0 },
-          { 10368, 12818, 14610, 17350, 19568, 20710, 22971, 25114, 26340,
-            29127, 32768, 0 },
-          { 8960, 11192, 13720, 18429, 20409, 20417, 22250, 23318, 24647, 27248,
-            32768, 0 },
-          { 7808, 11416, 13918, 19028, 20181, 20839, 24380, 26018, 26967, 29845,
-            32768, 0 },
+          { AOM_ICDF(12544), AOM_ICDF(14124), AOM_ICDF(16964), AOM_ICDF(21907),
+            AOM_ICDF(23808), AOM_ICDF(24496), AOM_ICDF(25724), AOM_ICDF(26715),
+            AOM_ICDF(27992), AOM_ICDF(30455), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10368), AOM_ICDF(13606), AOM_ICDF(18247), AOM_ICDF(20869),
+            AOM_ICDF(22590), AOM_ICDF(23749), AOM_ICDF(25088), AOM_ICDF(26378),
+            AOM_ICDF(27277), AOM_ICDF(29808), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9088), AOM_ICDF(11031), AOM_ICDF(12899), AOM_ICDF(23497),
+            AOM_ICDF(24465), AOM_ICDF(24851), AOM_ICDF(25995), AOM_ICDF(26815),
+            AOM_ICDF(27885), AOM_ICDF(30555), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(11520), AOM_ICDF(14342), AOM_ICDF(15710), AOM_ICDF(19196),
+            AOM_ICDF(21250), AOM_ICDF(21907), AOM_ICDF(24665), AOM_ICDF(26153),
+            AOM_ICDF(27212), AOM_ICDF(30750), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9984), AOM_ICDF(11764), AOM_ICDF(13979), AOM_ICDF(16405),
+            AOM_ICDF(19279), AOM_ICDF(20658), AOM_ICDF(23354), AOM_ICDF(25266),
+            AOM_ICDF(26702), AOM_ICDF(29380), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10112), AOM_ICDF(12325), AOM_ICDF(15918), AOM_ICDF(19060),
+            AOM_ICDF(21829), AOM_ICDF(23882), AOM_ICDF(26277), AOM_ICDF(27697),
+            AOM_ICDF(30114), AOM_ICDF(32758), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9344), AOM_ICDF(10534), AOM_ICDF(12184), AOM_ICDF(16208),
+            AOM_ICDF(19764), AOM_ICDF(20627), AOM_ICDF(22524), AOM_ICDF(23644),
+            AOM_ICDF(26887), AOM_ICDF(29782), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(12928), AOM_ICDF(14013), AOM_ICDF(15625), AOM_ICDF(19107),
+            AOM_ICDF(20654), AOM_ICDF(21451), AOM_ICDF(22910), AOM_ICDF(23873),
+            AOM_ICDF(24776), AOM_ICDF(30239), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10368), AOM_ICDF(12818), AOM_ICDF(14610), AOM_ICDF(17350),
+            AOM_ICDF(19568), AOM_ICDF(20710), AOM_ICDF(22971), AOM_ICDF(25114),
+            AOM_ICDF(26340), AOM_ICDF(29127), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8960), AOM_ICDF(11192), AOM_ICDF(13720), AOM_ICDF(18429),
+            AOM_ICDF(20409), AOM_ICDF(20417), AOM_ICDF(22250), AOM_ICDF(23318),
+            AOM_ICDF(24647), AOM_ICDF(27248), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(7808), AOM_ICDF(11416), AOM_ICDF(13918), AOM_ICDF(19028),
+            AOM_ICDF(20181), AOM_ICDF(20839), AOM_ICDF(24380), AOM_ICDF(26018),
+            AOM_ICDF(26967), AOM_ICDF(29845), AOM_ICDF(32768), 0 },
       },
       {
-          { 9856, 11020, 14928, 18159, 19421, 20921, 23466, 26664, 27475, 28881,
-            32768, 0 },
-          { 8704, 10302, 17323, 18907, 19868, 21184, 24171, 28033, 28625, 29353,
-            32768, 0 },
-          { 7936, 9197, 12604, 20616, 21514, 22371, 24239, 26138, 26863, 29239,
-            32768, 0 },
-          { 11264, 12524, 16083, 18574, 19858, 20841, 24242, 27606, 28352,
-            29853, 32768, 0 },
-          { 8704, 10208, 13292, 15170, 17277, 19226, 22083, 25046, 26041, 27802,
-            32768, 0 },
-          { 9088, 10568, 15511, 17246, 20170, 22791, 25558, 30740, 31635, 32764,
-            32768, 0 },
-          { 7040, 8045, 10653, 13145, 15286, 16614, 19075, 23140, 26224, 28652,
-            32768, 0 },
-          { 10240, 11032, 14258, 17629, 18914, 19898, 22412, 24961, 25815,
-            29156, 32768, 0 },
-          { 11008, 12028, 14702, 16147, 17209, 18160, 21812, 27547, 28709,
-            30120, 32768, 0 },
-          { 7168, 9068, 14160, 16937, 18515, 18521, 20636, 24617, 25317, 26365,
-            32768, 0 },
-          { 6784, 8510, 14195, 17148, 18158, 19201, 23070, 27351, 27901, 29422,
-            32768, 0 },
+          { AOM_ICDF(9856), AOM_ICDF(11020), AOM_ICDF(14928), AOM_ICDF(18159),
+            AOM_ICDF(19421), AOM_ICDF(20921), AOM_ICDF(23466), AOM_ICDF(26664),
+            AOM_ICDF(27475), AOM_ICDF(28881), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8704), AOM_ICDF(10302), AOM_ICDF(17323), AOM_ICDF(18907),
+            AOM_ICDF(19868), AOM_ICDF(21184), AOM_ICDF(24171), AOM_ICDF(28033),
+            AOM_ICDF(28625), AOM_ICDF(29353), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(7936), AOM_ICDF(9197), AOM_ICDF(12604), AOM_ICDF(20616),
+            AOM_ICDF(21514), AOM_ICDF(22371), AOM_ICDF(24239), AOM_ICDF(26138),
+            AOM_ICDF(26863), AOM_ICDF(29239), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(11264), AOM_ICDF(12524), AOM_ICDF(16083), AOM_ICDF(18574),
+            AOM_ICDF(19858), AOM_ICDF(20841), AOM_ICDF(24242), AOM_ICDF(27606),
+            AOM_ICDF(28352), AOM_ICDF(29853), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8704), AOM_ICDF(10208), AOM_ICDF(13292), AOM_ICDF(15170),
+            AOM_ICDF(17277), AOM_ICDF(19226), AOM_ICDF(22083), AOM_ICDF(25046),
+            AOM_ICDF(26041), AOM_ICDF(27802), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9088), AOM_ICDF(10568), AOM_ICDF(15511), AOM_ICDF(17246),
+            AOM_ICDF(20170), AOM_ICDF(22791), AOM_ICDF(25558), AOM_ICDF(30740),
+            AOM_ICDF(31635), AOM_ICDF(32764), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(7040), AOM_ICDF(8045), AOM_ICDF(10653), AOM_ICDF(13145),
+            AOM_ICDF(15286), AOM_ICDF(16614), AOM_ICDF(19075), AOM_ICDF(23140),
+            AOM_ICDF(26224), AOM_ICDF(28652), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(10240), AOM_ICDF(11032), AOM_ICDF(14258), AOM_ICDF(17629),
+            AOM_ICDF(18914), AOM_ICDF(19898), AOM_ICDF(22412), AOM_ICDF(24961),
+            AOM_ICDF(25815), AOM_ICDF(29156), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(11008), AOM_ICDF(12028), AOM_ICDF(14702), AOM_ICDF(16147),
+            AOM_ICDF(17209), AOM_ICDF(18160), AOM_ICDF(21812), AOM_ICDF(27547),
+            AOM_ICDF(28709), AOM_ICDF(30120), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(7168), AOM_ICDF(9068), AOM_ICDF(14160), AOM_ICDF(16937),
+            AOM_ICDF(18515), AOM_ICDF(18521), AOM_ICDF(20636), AOM_ICDF(24617),
+            AOM_ICDF(25317), AOM_ICDF(26365), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6784), AOM_ICDF(8510), AOM_ICDF(14195), AOM_ICDF(17148),
+            AOM_ICDF(18158), AOM_ICDF(19201), AOM_ICDF(23070), AOM_ICDF(27351),
+            AOM_ICDF(27901), AOM_ICDF(29422), AOM_ICDF(32768), 0 },
       },
       {
-          { 10112, 11528, 15345, 19296, 21394, 21402, 22379, 23840, 24851,
-            26150, 32768, 0 },
-          { 8064, 10187, 17949, 20052, 22051, 22059, 23147, 24688, 25351, 26365,
-            32768, 0 },
-          { 6528, 8373, 11041, 21963, 23089, 23093, 24076, 24925, 25691, 27764,
-            32768, 0 },
-          { 9600, 11229, 14847, 17527, 19738, 19747, 21629, 23761, 24957, 27673,
-            32768, 0 },
-          { 8960, 10262, 13339, 15480, 19925, 19942, 21445, 23037, 24329, 25977,
-            32768, 0 },
-          { 2944, 5973, 8904, 11875, 14864, 17853, 20824, 23810, 26784, 29776,
-            32768, 0 },
-          { 9472, 10564, 13426, 16561, 19685, 19697, 21076, 22583, 24891, 26983,
-            32768, 0 },
-          { 8448, 9493, 12221, 16542, 18394, 18401, 19580, 20971, 22031, 26770,
-            32768, 0 },
-          { 8704, 10772, 14209, 16381, 18911, 18921, 20436, 23374, 24475, 26095,
-            32768, 0 },
-          { 7680, 9444, 13453, 16320, 18650, 18659, 19651, 21291, 22277, 23916,
-            32768, 0 },
-          { 6656, 9920, 14740, 19864, 21495, 21501, 22953, 24372, 25192, 26760,
-            32768, 0 },
+          { AOM_ICDF(10112), AOM_ICDF(11528), AOM_ICDF(15345), AOM_ICDF(19296),
+            AOM_ICDF(21394), AOM_ICDF(21402), AOM_ICDF(22379), AOM_ICDF(23840),
+            AOM_ICDF(24851), AOM_ICDF(26150), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8064), AOM_ICDF(10187), AOM_ICDF(17949), AOM_ICDF(20052),
+            AOM_ICDF(22051), AOM_ICDF(22059), AOM_ICDF(23147), AOM_ICDF(24688),
+            AOM_ICDF(25351), AOM_ICDF(26365), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6528), AOM_ICDF(8373), AOM_ICDF(11041), AOM_ICDF(21963),
+            AOM_ICDF(23089), AOM_ICDF(23093), AOM_ICDF(24076), AOM_ICDF(24925),
+            AOM_ICDF(25691), AOM_ICDF(27764), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9600), AOM_ICDF(11229), AOM_ICDF(14847), AOM_ICDF(17527),
+            AOM_ICDF(19738), AOM_ICDF(19747), AOM_ICDF(21629), AOM_ICDF(23761),
+            AOM_ICDF(24957), AOM_ICDF(27673), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8960), AOM_ICDF(10262), AOM_ICDF(13339), AOM_ICDF(15480),
+            AOM_ICDF(19925), AOM_ICDF(19942), AOM_ICDF(21445), AOM_ICDF(23037),
+            AOM_ICDF(24329), AOM_ICDF(25977), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(2944), AOM_ICDF(5973), AOM_ICDF(8904), AOM_ICDF(11875),
+            AOM_ICDF(14864), AOM_ICDF(17853), AOM_ICDF(20824), AOM_ICDF(23810),
+            AOM_ICDF(26784), AOM_ICDF(29776), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9472), AOM_ICDF(10564), AOM_ICDF(13426), AOM_ICDF(16561),
+            AOM_ICDF(19685), AOM_ICDF(19697), AOM_ICDF(21076), AOM_ICDF(22583),
+            AOM_ICDF(24891), AOM_ICDF(26983), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8448), AOM_ICDF(9493), AOM_ICDF(12221), AOM_ICDF(16542),
+            AOM_ICDF(18394), AOM_ICDF(18401), AOM_ICDF(19580), AOM_ICDF(20971),
+            AOM_ICDF(22031), AOM_ICDF(26770), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8704), AOM_ICDF(10772), AOM_ICDF(14209), AOM_ICDF(16381),
+            AOM_ICDF(18911), AOM_ICDF(18921), AOM_ICDF(20436), AOM_ICDF(23374),
+            AOM_ICDF(24475), AOM_ICDF(26095), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(7680), AOM_ICDF(9444), AOM_ICDF(13453), AOM_ICDF(16320),
+            AOM_ICDF(18650), AOM_ICDF(18659), AOM_ICDF(19651), AOM_ICDF(21291),
+            AOM_ICDF(22277), AOM_ICDF(23916), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6656), AOM_ICDF(9920), AOM_ICDF(14740), AOM_ICDF(19864),
+            AOM_ICDF(21495), AOM_ICDF(21501), AOM_ICDF(22953), AOM_ICDF(24372),
+            AOM_ICDF(25192), AOM_ICDF(26760), AOM_ICDF(32768), 0 },
       },
       {
-          { 9728, 13958, 18881, 23624, 24754, 25553, 26709, 27940, 28977, 30413,
-            32768, 0 },
-          { 8832, 12572, 22433, 24653, 25676, 26551, 27571, 28688, 29198, 30174,
-            32768, 0 },
-          { 5888, 8828, 11353, 23482, 24310, 24737, 25804, 26375, 27174, 29840,
-            32768, 0 },
-          { 9984, 13099, 16249, 19443, 20990, 22637, 24576, 25952, 26884, 29435,
-            32768, 0 },
-          { 8448, 11108, 15085, 18134, 20319, 21992, 23549, 24989, 27177, 29208,
-            32768, 0 },
-          { 9856, 13168, 18987, 22481, 24282, 26200, 27868, 30203, 31085, 32761,
-            32768, 0 },
-          { 6784, 9119, 12629, 16877, 20262, 21125, 22307, 23615, 27727, 29972,
-            32768, 0 },
-          { 8320, 10230, 12783, 19005, 20213, 20668, 22039, 23045, 24146, 30478,
-            32768, 0 },
-          { 9088, 11308, 15416, 18118, 19762, 20906, 22574, 25162, 25994, 28455,
-            32768, 0 },
-          { 6912, 10548, 15148, 20026, 21612, 21618, 22707, 24200, 24869, 26844,
-            32768, 0 },
-          { 6656, 12164, 16993, 21568, 22933, 23648, 25322, 26602, 27806, 29841,
-            32768, 0 },
+          { AOM_ICDF(9728), AOM_ICDF(13958), AOM_ICDF(18881), AOM_ICDF(23624),
+            AOM_ICDF(24754), AOM_ICDF(25553), AOM_ICDF(26709), AOM_ICDF(27940),
+            AOM_ICDF(28977), AOM_ICDF(30413), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8832), AOM_ICDF(12572), AOM_ICDF(22433), AOM_ICDF(24653),
+            AOM_ICDF(25676), AOM_ICDF(26551), AOM_ICDF(27571), AOM_ICDF(28688),
+            AOM_ICDF(29198), AOM_ICDF(30174), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(5888), AOM_ICDF(8828), AOM_ICDF(11353), AOM_ICDF(23482),
+            AOM_ICDF(24310), AOM_ICDF(24737), AOM_ICDF(25804), AOM_ICDF(26375),
+            AOM_ICDF(27174), AOM_ICDF(29840), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9984), AOM_ICDF(13099), AOM_ICDF(16249), AOM_ICDF(19443),
+            AOM_ICDF(20990), AOM_ICDF(22637), AOM_ICDF(24576), AOM_ICDF(25952),
+            AOM_ICDF(26884), AOM_ICDF(29435), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8448), AOM_ICDF(11108), AOM_ICDF(15085), AOM_ICDF(18134),
+            AOM_ICDF(20319), AOM_ICDF(21992), AOM_ICDF(23549), AOM_ICDF(24989),
+            AOM_ICDF(27177), AOM_ICDF(29208), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9856), AOM_ICDF(13168), AOM_ICDF(18987), AOM_ICDF(22481),
+            AOM_ICDF(24282), AOM_ICDF(26200), AOM_ICDF(27868), AOM_ICDF(30203),
+            AOM_ICDF(31085), AOM_ICDF(32761), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6784), AOM_ICDF(9119), AOM_ICDF(12629), AOM_ICDF(16877),
+            AOM_ICDF(20262), AOM_ICDF(21125), AOM_ICDF(22307), AOM_ICDF(23615),
+            AOM_ICDF(27727), AOM_ICDF(29972), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(8320), AOM_ICDF(10230), AOM_ICDF(12783), AOM_ICDF(19005),
+            AOM_ICDF(20213), AOM_ICDF(20668), AOM_ICDF(22039), AOM_ICDF(23045),
+            AOM_ICDF(24146), AOM_ICDF(30478), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(9088), AOM_ICDF(11308), AOM_ICDF(15416), AOM_ICDF(18118),
+            AOM_ICDF(19762), AOM_ICDF(20906), AOM_ICDF(22574), AOM_ICDF(25162),
+            AOM_ICDF(25994), AOM_ICDF(28455), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6912), AOM_ICDF(10548), AOM_ICDF(15148), AOM_ICDF(20026),
+            AOM_ICDF(21612), AOM_ICDF(21618), AOM_ICDF(22707), AOM_ICDF(24200),
+            AOM_ICDF(24869), AOM_ICDF(26844), AOM_ICDF(32768), 0 },
+          { AOM_ICDF(6656), AOM_ICDF(12164), AOM_ICDF(16993), AOM_ICDF(21568),
+            AOM_ICDF(22933), AOM_ICDF(23648), AOM_ICDF(25322), AOM_ICDF(26602),
+            AOM_ICDF(27806), AOM_ICDF(29841), AOM_ICDF(32768), 0 },
       },
 #else   // !CONFIG_ALT_INTRA
-      { { 17536, 19321, 21527, 25360, 27516, 28026, 29323, 30023, 30999, 32768,
-          0 },
-        { 11776, 15466, 22360, 24865, 26991, 27889, 29299, 30519, 31398, 32768,
-          0 },
-        { 9344, 12272, 13793, 25813, 27359, 27654, 28573, 29130, 30551, 32768,
-          0 },
-        { 11648, 14123, 16454, 19948, 22780, 23846, 27087, 28995, 30380, 32768,
-          0 },
-        { 9216, 12436, 15295, 17996, 24006, 25465, 27405, 28725, 30383, 32768,
-          0 },
-        { 9344, 12181, 14433, 16634, 20355, 24317, 26133, 29295, 31344, 32768,
-          0 },
-        { 8576, 10750, 12556, 17996, 22315, 23609, 25040, 26157, 30573, 32768,
-          0 },
-        { 11008, 13303, 15432, 20646, 23506, 24100, 25624, 26824, 28055, 32768,
-          0 },
-        { 9472, 12384, 14534, 17094, 20257, 22155, 24767, 28955, 30474, 32768,
-          0 },
-        { 7552, 14152, 17352, 22654, 25123, 25783, 27911, 29182, 30849, 32768,
-          0 } },
-      { { 8064, 11538, 21987, 24941, 26913, 28136, 29222, 30469, 31331, 32768,
-          0 },
-        { 5504, 10403, 25080, 26762, 27933, 29104, 30092, 31576, 32004, 32768,
-          0 },
-        { 5632, 8706, 15097, 23714, 25344, 26072, 27380, 28580, 29840, 32768,
-          0 },
-        { 7424, 11186, 17593, 20154, 22974, 24351, 26916, 29956, 30967, 32768,
-          0 },
-        { 5888, 10193, 16895, 19031, 23735, 25576, 27514, 29813, 30471, 32768,
-          0 },
-        { 4864, 8352, 16459, 18062, 21263, 25378, 26937, 30376, 31619, 32768,
-          0 },
-        { 4992, 7922, 13842, 18004, 21779, 23527, 25115, 27357, 30232, 32768,
-          0 },
-        { 6656, 9716, 16379, 20053, 22487, 23613, 25437, 27270, 28516, 32768,
-          0 },
-        { 6016, 9674, 16891, 18684, 21147, 23093, 25512, 30132, 30894, 32768,
-          0 },
-        { 4608, 11318, 21038, 23650, 25303, 26262, 28295, 30479, 31212, 32768,
-          0 } },
-      { { 10496, 12758, 14790, 24547, 26342, 26799, 27825, 28443, 30217, 32768,
-          0 },
-        { 7040, 11462, 17121, 24215, 26504, 27267, 28492, 29444, 30846, 32768,
-          0 },
-        { 5376, 8158, 9215, 26451, 27407, 27524, 27995, 28275, 29767, 32768,
-          0 },
-        { 8704, 12652, 14145, 20101, 22879, 23675, 25629, 27079, 28923, 32768,
-          0 },
-        { 7424, 12374, 14366, 18855, 23842, 24358, 25639, 27087, 29706, 32768,
-          0 },
-        { 6400, 10005, 12939, 17753, 22206, 24790, 26785, 28164, 30520, 32768,
-          0 },
-        { 5632, 8176, 9713, 19053, 22343, 23222, 24453, 25070, 29761, 32768,
-          0 },
-        { 7040, 9754, 10833, 21229, 23540, 23943, 24839, 25675, 27033, 32768,
-          0 },
-        { 6784, 11758, 13481, 17236, 20210, 21768, 24303, 26948, 28676, 32768,
-          0 },
-        { 4864, 12712, 14201, 23863, 25952, 26386, 27632, 28635, 30362, 32768,
-          0 } },
-      { { 13184, 15173, 17647, 21576, 24474, 25267, 27699, 29283, 30549, 32768,
-          0 },
-        { 7552, 11295, 18257, 20811, 23213, 24606, 27731, 30407, 31237, 32768,
-          0 },
-        { 7936, 10846, 12816, 22436, 24614, 25130, 26890, 28199, 29091, 32768,
-          0 },
-        { 8576, 11411, 13830, 15918, 18996, 20044, 25114, 27835, 28972, 32768,
-          0 },
-        { 7680, 10816, 13646, 15966, 21162, 22012, 24701, 27506, 29644, 32768,
-          0 },
-        { 6784, 9423, 12524, 14773, 19447, 22804, 26073, 29211, 30642, 32768,
-          0 },
-        { 6784, 8916, 11059, 15861, 21174, 22338, 24620, 27071, 30899, 32768,
-          0 },
-        { 9856, 11557, 13960, 18525, 21788, 22189, 24462, 26603, 27470, 32768,
-          0 },
-        { 7808, 10636, 13143, 15844, 18698, 20272, 24323, 30096, 31787, 32768,
-          0 },
-        { 6016, 10928, 14596, 18926, 21586, 22688, 26626, 29001, 30399, 32768,
-          0 } },
-      { { 8832, 10983, 13451, 16582, 21656, 23109, 24845, 26207, 28796, 32768,
-          0 },
-        { 6784, 10844, 15554, 18073, 22954, 24901, 26776, 28649, 30419, 32768,
-          0 },
-        { 5120, 8252, 10072, 20108, 23535, 24346, 25761, 26418, 28675, 32768,
-          0 },
-        { 7680, 11012, 12627, 14595, 19462, 20888, 23348, 25703, 28159, 32768,
-          0 },
-        { 6656, 9818, 11790, 13813, 22731, 24737, 26557, 28061, 29697, 32768,
-          0 },
-        { 5632, 8918, 11620, 13802, 19950, 23764, 25734, 28537, 31809, 32768,
-          0 },
-        { 4480, 6580, 7808, 12281, 19375, 20970, 22860, 24602, 29929, 32768,
-          0 },
-        { 7040, 9553, 11457, 15102, 20291, 21280, 22985, 24475, 26613, 32768,
-          0 },
-        { 6528, 10423, 12605, 14621, 19031, 21505, 24585, 27558, 29532, 32768,
-          0 },
-        { 6016, 11659, 14463, 18867, 23653, 24903, 27115, 29389, 31382, 32768,
-          0 } },
-      { { 8192, 10016, 13304, 16362, 21107, 25165, 26620, 28901, 30910, 32768,
-          0 },
-        { 5888, 8723, 16237, 18318, 22002, 25923, 27394, 29934, 31428, 32768,
-          0 },
-        { 4608, 7138, 9841, 18442, 22447, 24618, 26337, 27945, 30168, 32768,
-          0 },
-        { 6784, 8916, 12270, 14851, 19886, 22759, 25105, 28368, 29760, 32768,
-          0 },
-        { 5120, 7928, 11324, 13340, 21205, 24224, 25926, 28518, 30560, 32768,
-          0 },
-        { 4480, 6580, 10058, 11237, 16807, 25937, 27218, 30015, 31348, 32768,
-          0 },
-        { 4608, 6808, 9445, 12446, 18461, 21835, 23244, 26109, 30115, 32768,
-          0 },
-        { 5760, 7659, 10798, 14720, 19157, 21955, 23645, 26460, 28702, 32768,
-          0 },
-        { 5760, 8503, 11157, 13071, 17594, 22047, 24099, 29077, 30850, 32768,
-          0 },
-        { 4864, 9660, 14264, 17105, 21528, 24094, 26025, 28580, 30559, 32768,
-          0 } },
-      { { 9600, 11139, 12998, 18660, 22158, 23501, 24659, 25736, 30296, 32768,
-          0 },
-        { 7168, 11068, 15984, 19969, 23169, 24704, 26216, 27572, 31368, 32768,
-          0 },
-        { 4480, 6801, 8018, 20908, 23071, 23583, 24301, 25062, 29427, 32768,
-          0 },
-        { 7168, 10068, 11753, 15843, 19742, 21358, 23809, 26189, 29067, 32768,
-          0 },
-        { 6016, 9047, 10622, 13931, 22462, 23858, 25911, 27277, 29722, 32768,
-          0 },
-        { 5888, 7568, 9931, 13533, 18431, 22063, 23777, 26025, 30555, 32768,
-          0 },
-        { 4352, 6239, 7379, 13739, 16917, 18090, 18835, 19651, 30360, 32768,
-          0 },
-        { 6528, 8988, 10288, 15534, 19495, 20386, 21934, 23034, 26988, 32768,
-          0 },
-        { 7040, 10055, 11652, 14757, 19622, 21715, 23615, 26761, 29483, 32768,
-          0 },
-        { 4736, 10102, 12315, 19078, 21348, 22621, 24246, 26044, 29931, 32768,
-          0 } },
-      { { 10496, 12410, 14955, 19891, 23137, 23792, 25159, 26378, 28125, 32768,
-          0 },
-        { 7936, 12204, 17104, 20191, 23468, 24630, 26156, 27628, 28913, 32768,
-          0 },
-        { 6016, 8629, 10232, 23591, 25349, 25637, 26306, 27063, 28980, 32768,
-          0 },
-        { 8704, 12088, 13461, 16646, 20516, 21455, 24062, 26579, 28368, 32768,
-          0 },
-        { 7296, 11177, 13117, 16196, 23378, 24708, 26440, 27997, 29078, 32768,
-          0 },
-        { 6272, 9377, 12575, 15616, 20919, 23697, 26603, 27566, 29903, 32768,
-          0 },
-        { 6528, 9091, 10478, 16445, 21081, 22320, 23871, 25087, 29258, 32768,
-          0 },
-        { 8704, 11148, 12499, 17340, 20656, 21288, 22588, 23701, 24693, 32768,
-          0 },
-        { 7552, 11394, 12980, 15562, 19942, 21792, 25093, 28211, 28959, 32768,
-          0 },
-        { 5120, 11708, 13847, 19377, 22421, 23160, 25449, 27136, 29182, 32768,
-          0 } },
-      { { 9984, 12031, 15190, 18673, 21422, 22812, 25690, 29118, 30458, 32768,
-          0 },
-        { 6144, 9680, 17436, 19610, 21820, 23485, 26313, 30826, 31843, 32768,
-          0 },
-        { 6016, 8315, 10607, 19333, 21572, 22553, 25266, 27288, 28551, 32768,
-          0 },
-        { 7168, 9668, 12646, 16257, 19648, 20899, 25304, 30465, 31625, 32768,
-          0 },
-        { 6144, 9368, 11836, 14130, 19153, 21157, 24876, 28452, 29396, 32768,
-          0 },
-        { 5504, 8486, 11996, 14412, 17968, 21814, 24424, 30682, 32059, 32768,
-          0 },
-        { 5376, 7195, 9592, 13331, 17569, 19460, 22371, 25458, 28942, 32768,
-          0 },
-        { 7424, 9206, 11783, 16456, 19253, 20390, 23775, 27007, 28425, 32768,
-          0 },
-        { 5888, 8303, 11361, 13440, 15848, 17549, 21532, 29564, 30665, 32768,
-          0 },
-        { 4608, 8788, 13284, 16621, 18983, 20286, 24577, 28960, 30314, 32768,
-          0 } },
-      { { 8320, 15005, 19168, 24282, 26707, 27402, 28681, 29639, 30629, 32768,
-          0 },
-        { 5632, 13900, 22376, 24867, 26804, 27734, 29130, 30722, 31465, 32768,
-          0 },
-        { 4992, 9115, 11055, 24893, 26316, 26661, 27663, 28301, 29418, 32768,
-          0 },
-        { 7424, 12077, 14987, 19596, 22615, 23600, 26465, 28484, 29789, 32768,
-          0 },
-        { 6272, 11447, 14362, 18204, 23418, 24715, 26697, 28547, 29520, 32768,
-          0 },
-        { 5248, 10946, 15379, 18167, 22197, 25432, 27295, 30031, 30576, 32768,
-          0 },
-        { 5120, 9008, 11607, 18210, 22327, 23427, 24887, 26580, 29892, 32768,
-          0 },
-        { 6656, 10124, 12689, 19922, 22480, 22807, 24441, 25579, 26787, 32768,
-          0 },
-        { 5376, 10084, 13983, 17113, 19996, 21614, 24403, 28651, 29938, 32768,
-          0 },
-        { 5504, 14131, 17989, 23324, 25513, 26071, 27850, 29464, 30393, 32768,
-          0 } },
+      { { AOM_ICDF(17536), AOM_ICDF(19321), AOM_ICDF(21527), AOM_ICDF(25360),
+          AOM_ICDF(27516), AOM_ICDF(28026), AOM_ICDF(29323), AOM_ICDF(30023),
+          AOM_ICDF(30999), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(11776), AOM_ICDF(15466), AOM_ICDF(22360), AOM_ICDF(24865),
+          AOM_ICDF(26991), AOM_ICDF(27889), AOM_ICDF(29299), AOM_ICDF(30519),
+          AOM_ICDF(31398), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(9344), AOM_ICDF(12272), AOM_ICDF(13793), AOM_ICDF(25813),
+          AOM_ICDF(27359), AOM_ICDF(27654), AOM_ICDF(28573), AOM_ICDF(29130),
+          AOM_ICDF(30551), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(11648), AOM_ICDF(14123), AOM_ICDF(16454), AOM_ICDF(19948),
+          AOM_ICDF(22780), AOM_ICDF(23846), AOM_ICDF(27087), AOM_ICDF(28995),
+          AOM_ICDF(30380), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(9216), AOM_ICDF(12436), AOM_ICDF(15295), AOM_ICDF(17996),
+          AOM_ICDF(24006), AOM_ICDF(25465), AOM_ICDF(27405), AOM_ICDF(28725),
+          AOM_ICDF(30383), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(9344), AOM_ICDF(12181), AOM_ICDF(14433), AOM_ICDF(16634),
+          AOM_ICDF(20355), AOM_ICDF(24317), AOM_ICDF(26133), AOM_ICDF(29295),
+          AOM_ICDF(31344), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(8576), AOM_ICDF(10750), AOM_ICDF(12556), AOM_ICDF(17996),
+          AOM_ICDF(22315), AOM_ICDF(23609), AOM_ICDF(25040), AOM_ICDF(26157),
+          AOM_ICDF(30573), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(11008), AOM_ICDF(13303), AOM_ICDF(15432), AOM_ICDF(20646),
+          AOM_ICDF(23506), AOM_ICDF(24100), AOM_ICDF(25624), AOM_ICDF(26824),
+          AOM_ICDF(28055), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(9472), AOM_ICDF(12384), AOM_ICDF(14534), AOM_ICDF(17094),
+          AOM_ICDF(20257), AOM_ICDF(22155), AOM_ICDF(24767), AOM_ICDF(28955),
+          AOM_ICDF(30474), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7552), AOM_ICDF(14152), AOM_ICDF(17352), AOM_ICDF(22654),
+          AOM_ICDF(25123), AOM_ICDF(25783), AOM_ICDF(27911), AOM_ICDF(29182),
+          AOM_ICDF(30849), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(8064), AOM_ICDF(11538), AOM_ICDF(21987), AOM_ICDF(24941),
+          AOM_ICDF(26913), AOM_ICDF(28136), AOM_ICDF(29222), AOM_ICDF(30469),
+          AOM_ICDF(31331), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5504), AOM_ICDF(10403), AOM_ICDF(25080), AOM_ICDF(26762),
+          AOM_ICDF(27933), AOM_ICDF(29104), AOM_ICDF(30092), AOM_ICDF(31576),
+          AOM_ICDF(32004), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5632), AOM_ICDF(8706), AOM_ICDF(15097), AOM_ICDF(23714),
+          AOM_ICDF(25344), AOM_ICDF(26072), AOM_ICDF(27380), AOM_ICDF(28580),
+          AOM_ICDF(29840), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7424), AOM_ICDF(11186), AOM_ICDF(17593), AOM_ICDF(20154),
+          AOM_ICDF(22974), AOM_ICDF(24351), AOM_ICDF(26916), AOM_ICDF(29956),
+          AOM_ICDF(30967), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5888), AOM_ICDF(10193), AOM_ICDF(16895), AOM_ICDF(19031),
+          AOM_ICDF(23735), AOM_ICDF(25576), AOM_ICDF(27514), AOM_ICDF(29813),
+          AOM_ICDF(30471), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4864), AOM_ICDF(8352), AOM_ICDF(16459), AOM_ICDF(18062),
+          AOM_ICDF(21263), AOM_ICDF(25378), AOM_ICDF(26937), AOM_ICDF(30376),
+          AOM_ICDF(31619), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4992), AOM_ICDF(7922), AOM_ICDF(13842), AOM_ICDF(18004),
+          AOM_ICDF(21779), AOM_ICDF(23527), AOM_ICDF(25115), AOM_ICDF(27357),
+          AOM_ICDF(30232), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6656), AOM_ICDF(9716), AOM_ICDF(16379), AOM_ICDF(20053),
+          AOM_ICDF(22487), AOM_ICDF(23613), AOM_ICDF(25437), AOM_ICDF(27270),
+          AOM_ICDF(28516), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6016), AOM_ICDF(9674), AOM_ICDF(16891), AOM_ICDF(18684),
+          AOM_ICDF(21147), AOM_ICDF(23093), AOM_ICDF(25512), AOM_ICDF(30132),
+          AOM_ICDF(30894), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4608), AOM_ICDF(11318), AOM_ICDF(21038), AOM_ICDF(23650),
+          AOM_ICDF(25303), AOM_ICDF(26262), AOM_ICDF(28295), AOM_ICDF(30479),
+          AOM_ICDF(31212), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(10496), AOM_ICDF(12758), AOM_ICDF(14790), AOM_ICDF(24547),
+          AOM_ICDF(26342), AOM_ICDF(26799), AOM_ICDF(27825), AOM_ICDF(28443),
+          AOM_ICDF(30217), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7040), AOM_ICDF(11462), AOM_ICDF(17121), AOM_ICDF(24215),
+          AOM_ICDF(26504), AOM_ICDF(27267), AOM_ICDF(28492), AOM_ICDF(29444),
+          AOM_ICDF(30846), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5376), AOM_ICDF(8158), AOM_ICDF(9215), AOM_ICDF(26451),
+          AOM_ICDF(27407), AOM_ICDF(27524), AOM_ICDF(27995), AOM_ICDF(28275),
+          AOM_ICDF(29767), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(8704), AOM_ICDF(12652), AOM_ICDF(14145), AOM_ICDF(20101),
+          AOM_ICDF(22879), AOM_ICDF(23675), AOM_ICDF(25629), AOM_ICDF(27079),
+          AOM_ICDF(28923), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7424), AOM_ICDF(12374), AOM_ICDF(14366), AOM_ICDF(18855),
+          AOM_ICDF(23842), AOM_ICDF(24358), AOM_ICDF(25639), AOM_ICDF(27087),
+          AOM_ICDF(29706), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6400), AOM_ICDF(10005), AOM_ICDF(12939), AOM_ICDF(17753),
+          AOM_ICDF(22206), AOM_ICDF(24790), AOM_ICDF(26785), AOM_ICDF(28164),
+          AOM_ICDF(30520), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5632), AOM_ICDF(8176), AOM_ICDF(9713), AOM_ICDF(19053),
+          AOM_ICDF(22343), AOM_ICDF(23222), AOM_ICDF(24453), AOM_ICDF(25070),
+          AOM_ICDF(29761), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7040), AOM_ICDF(9754), AOM_ICDF(10833), AOM_ICDF(21229),
+          AOM_ICDF(23540), AOM_ICDF(23943), AOM_ICDF(24839), AOM_ICDF(25675),
+          AOM_ICDF(27033), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6784), AOM_ICDF(11758), AOM_ICDF(13481), AOM_ICDF(17236),
+          AOM_ICDF(20210), AOM_ICDF(21768), AOM_ICDF(24303), AOM_ICDF(26948),
+          AOM_ICDF(28676), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4864), AOM_ICDF(12712), AOM_ICDF(14201), AOM_ICDF(23863),
+          AOM_ICDF(25952), AOM_ICDF(26386), AOM_ICDF(27632), AOM_ICDF(28635),
+          AOM_ICDF(30362), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(13184), AOM_ICDF(15173), AOM_ICDF(17647), AOM_ICDF(21576),
+          AOM_ICDF(24474), AOM_ICDF(25267), AOM_ICDF(27699), AOM_ICDF(29283),
+          AOM_ICDF(30549), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7552), AOM_ICDF(11295), AOM_ICDF(18257), AOM_ICDF(20811),
+          AOM_ICDF(23213), AOM_ICDF(24606), AOM_ICDF(27731), AOM_ICDF(30407),
+          AOM_ICDF(31237), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7936), AOM_ICDF(10846), AOM_ICDF(12816), AOM_ICDF(22436),
+          AOM_ICDF(24614), AOM_ICDF(25130), AOM_ICDF(26890), AOM_ICDF(28199),
+          AOM_ICDF(29091), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(8576), AOM_ICDF(11411), AOM_ICDF(13830), AOM_ICDF(15918),
+          AOM_ICDF(18996), AOM_ICDF(20044), AOM_ICDF(25114), AOM_ICDF(27835),
+          AOM_ICDF(28972), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7680), AOM_ICDF(10816), AOM_ICDF(13646), AOM_ICDF(15966),
+          AOM_ICDF(21162), AOM_ICDF(22012), AOM_ICDF(24701), AOM_ICDF(27506),
+          AOM_ICDF(29644), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6784), AOM_ICDF(9423), AOM_ICDF(12524), AOM_ICDF(14773),
+          AOM_ICDF(19447), AOM_ICDF(22804), AOM_ICDF(26073), AOM_ICDF(29211),
+          AOM_ICDF(30642), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6784), AOM_ICDF(8916), AOM_ICDF(11059), AOM_ICDF(15861),
+          AOM_ICDF(21174), AOM_ICDF(22338), AOM_ICDF(24620), AOM_ICDF(27071),
+          AOM_ICDF(30899), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(9856), AOM_ICDF(11557), AOM_ICDF(13960), AOM_ICDF(18525),
+          AOM_ICDF(21788), AOM_ICDF(22189), AOM_ICDF(24462), AOM_ICDF(26603),
+          AOM_ICDF(27470), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7808), AOM_ICDF(10636), AOM_ICDF(13143), AOM_ICDF(15844),
+          AOM_ICDF(18698), AOM_ICDF(20272), AOM_ICDF(24323), AOM_ICDF(30096),
+          AOM_ICDF(31787), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6016), AOM_ICDF(10928), AOM_ICDF(14596), AOM_ICDF(18926),
+          AOM_ICDF(21586), AOM_ICDF(22688), AOM_ICDF(26626), AOM_ICDF(29001),
+          AOM_ICDF(30399), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(8832), AOM_ICDF(10983), AOM_ICDF(13451), AOM_ICDF(16582),
+          AOM_ICDF(21656), AOM_ICDF(23109), AOM_ICDF(24845), AOM_ICDF(26207),
+          AOM_ICDF(28796), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6784), AOM_ICDF(10844), AOM_ICDF(15554), AOM_ICDF(18073),
+          AOM_ICDF(22954), AOM_ICDF(24901), AOM_ICDF(26776), AOM_ICDF(28649),
+          AOM_ICDF(30419), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5120), AOM_ICDF(8252), AOM_ICDF(10072), AOM_ICDF(20108),
+          AOM_ICDF(23535), AOM_ICDF(24346), AOM_ICDF(25761), AOM_ICDF(26418),
+          AOM_ICDF(28675), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7680), AOM_ICDF(11012), AOM_ICDF(12627), AOM_ICDF(14595),
+          AOM_ICDF(19462), AOM_ICDF(20888), AOM_ICDF(23348), AOM_ICDF(25703),
+          AOM_ICDF(28159), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6656), AOM_ICDF(9818), AOM_ICDF(11790), AOM_ICDF(13813),
+          AOM_ICDF(22731), AOM_ICDF(24737), AOM_ICDF(26557), AOM_ICDF(28061),
+          AOM_ICDF(29697), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5632), AOM_ICDF(8918), AOM_ICDF(11620), AOM_ICDF(13802),
+          AOM_ICDF(19950), AOM_ICDF(23764), AOM_ICDF(25734), AOM_ICDF(28537),
+          AOM_ICDF(31809), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4480), AOM_ICDF(6580), AOM_ICDF(7808), AOM_ICDF(12281),
+          AOM_ICDF(19375), AOM_ICDF(20970), AOM_ICDF(22860), AOM_ICDF(24602),
+          AOM_ICDF(29929), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7040), AOM_ICDF(9553), AOM_ICDF(11457), AOM_ICDF(15102),
+          AOM_ICDF(20291), AOM_ICDF(21280), AOM_ICDF(22985), AOM_ICDF(24475),
+          AOM_ICDF(26613), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6528, AOM_ICDF(10423), AOM_ICDF(12605), AOM_ICDF(14621),
+          AOM_ICDF(19031), AOM_ICDF(21505), AOM_ICDF(24585), AOM_ICDF(27558),
+          AOM_ICDF(29532), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6016), AOM_ICDF(11659), AOM_ICDF(14463), AOM_ICDF(18867),
+          AOM_ICDF(23653), AOM_ICDF(24903), AOM_ICDF(27115), AOM_ICDF(29389),
+          AOM_ICDF(31382), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(8192), AOM_ICDF(10016), AOM_ICDF(13304), AOM_ICDF(16362),
+          AOM_ICDF(21107), AOM_ICDF(25165), AOM_ICDF(26620), AOM_ICDF(28901),
+          AOM_ICDF(30910), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5888), AOM_ICDF(8723), AOM_ICDF(16237), AOM_ICDF(18318),
+          AOM_ICDF(22002), AOM_ICDF(25923), AOM_ICDF(27394), AOM_ICDF(29934),
+          AOM_ICDF(31428), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4608), AOM_ICDF(7138), AOM_ICDF(9841), AOM_ICDF(18442),
+          AOM_ICDF(22447), AOM_ICDF(24618), AOM_ICDF(26337), AOM_ICDF(27945),
+          AOM_ICDF(30168), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6784), AOM_ICDF(8916), AOM_ICDF(12270), AOM_ICDF(14851),
+          AOM_ICDF(19886), AOM_ICDF(22759), AOM_ICDF(25105), AOM_ICDF(28368),
+          AOM_ICDF(29760), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5120), AOM_ICDF(7928), AOM_ICDF(11324), AOM_ICDF(13340),
+          AOM_ICDF(21205), AOM_ICDF(24224), AOM_ICDF(25926), AOM_ICDF(28518),
+          AOM_ICDF(30560), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4480), AOM_ICDF(6580), AOM_ICDF(10058), AOM_ICDF(11237),
+          AOM_ICDF(16807), AOM_ICDF(25937), AOM_ICDF(27218), AOM_ICDF(30015),
+          AOM_ICDF(31348), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4608), AOM_ICDF(6808), AOM_ICDF(9445), AOM_ICDF(12446),
+          AOM_ICDF(18461), AOM_ICDF(21835), AOM_ICDF(23244), AOM_ICDF(26109),
+          AOM_ICDF(30115), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5760), AOM_ICDF(7659), AOM_ICDF(10798), AOM_ICDF(14720),
+          AOM_ICDF(19157), AOM_ICDF(21955), AOM_ICDF(23645), AOM_ICDF(26460),
+          AOM_ICDF(28702), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5760), AOM_ICDF(8503), AOM_ICDF(11157), AOM_ICDF(13071),
+          AOM_ICDF(17594), AOM_ICDF(22047), AOM_ICDF(24099), AOM_ICDF(29077),
+          AOM_ICDF(30850), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4864), AOM_ICDF(9660), AOM_ICDF(14264), AOM_ICDF(17105),
+          AOM_ICDF(21528), AOM_ICDF(24094), AOM_ICDF(26025), AOM_ICDF(28580),
+          AOM_ICDF(30559), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(9600), AOM_ICDF(11139), AOM_ICDF(12998), AOM_ICDF(18660),
+          AOM_ICDF(22158), AOM_ICDF(23501), AOM_ICDF(24659), AOM_ICDF(25736),
+          AOM_ICDF(30296), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7168), AOM_ICDF(11068), AOM_ICDF(15984), AOM_ICDF(19969),
+          AOM_ICDF(23169), AOM_ICDF(24704), AOM_ICDF(26216), AOM_ICDF(27572),
+          AOM_ICDF(31368), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4480), AOM_ICDF(6801), AOM_ICDF(8018), AOM_ICDF(20908),
+          AOM_ICDF(23071), AOM_ICDF(23583), AOM_ICDF(24301), AOM_ICDF(25062),
+          AOM_ICDF(29427), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7168), AOM_ICDF(10068), AOM_ICDF(11753), AOM_ICDF(15843),
+          AOM_ICDF(19742), AOM_ICDF(21358), AOM_ICDF(23809), AOM_ICDF(26189),
+          AOM_ICDF(29067), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6016), AOM_ICDF(9047), AOM_ICDF(10622), AOM_ICDF(13931),
+          AOM_ICDF(22462), AOM_ICDF(23858), AOM_ICDF(25911), AOM_ICDF(27277),
+          AOM_ICDF(29722), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5888), AOM_ICDF(7568), AOM_ICDF(9931), AOM_ICDF(13533),
+          AOM_ICDF(18431), AOM_ICDF(22063), AOM_ICDF(23777), AOM_ICDF(26025),
+          AOM_ICDF(30555), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4352), AOM_ICDF(6239), AOM_ICDF(7379), AOM_ICDF(13739),
+          AOM_ICDF(16917), AOM_ICDF(18090), AOM_ICDF(18835), AOM_ICDF(19651),
+          AOM_ICDF(30360), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6528), AOM_ICDF(8988), AOM_ICDF(10288), AOM_ICDF(15534),
+          AOM_ICDF(19495), AOM_ICDF(20386), AOM_ICDF(21934), AOM_ICDF(23034),
+          AOM_ICDF(26988), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7040), AOM_ICDF(10055), AOM_ICDF(11652), AOM_ICDF(14757),
+          AOM_ICDF(19622), AOM_ICDF(21715), AOM_ICDF(23615), AOM_ICDF(26761),
+          AOM_ICDF(29483), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4736), AOM_ICDF(10102), AOM_ICDF(12315), AOM_ICDF(19078),
+          AOM_ICDF(21348), AOM_ICDF(22621), AOM_ICDF(24246), AOM_ICDF(26044),
+          AOM_ICDF(29931), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(10496), AOM_ICDF(12410), AOM_ICDF(14955), AOM_ICDF(19891),
+          AOM_ICDF(23137), AOM_ICDF(23792), AOM_ICDF(25159), AOM_ICDF(26378),
+          AOM_ICDF(28125), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7936), AOM_ICDF(12204), AOM_ICDF(17104), AOM_ICDF(20191),
+          AOM_ICDF(23468), AOM_ICDF(24630), AOM_ICDF(26156), AOM_ICDF(27628),
+          AOM_ICDF(28913), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6016), AOM_ICDF(8629), AOM_ICDF(10232), AOM_ICDF(23591),
+          AOM_ICDF(25349), AOM_ICDF(25637), AOM_ICDF(26306), AOM_ICDF(27063),
+          AOM_ICDF(28980), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(8704), AOM_ICDF(12088), AOM_ICDF(13461), AOM_ICDF(16646),
+          AOM_ICDF(20516), AOM_ICDF(21455), AOM_ICDF(24062), AOM_ICDF(26579),
+          AOM_ICDF(28368), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7296), AOM_ICDF(11177), AOM_ICDF(13117), AOM_ICDF(16196),
+          AOM_ICDF(23378), AOM_ICDF(24708), AOM_ICDF(26440), AOM_ICDF(27997),
+          AOM_ICDF(29078), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6272), AOM_ICDF(9377), AOM_ICDF(12575), AOM_ICDF(15616),
+          AOM_ICDF(20919), AOM_ICDF(23697), AOM_ICDF(26603), AOM_ICDF(27566),
+          AOM_ICDF(29903), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6528), AOM_ICDF(9091), AOM_ICDF(10478), AOM_ICDF(16445),
+          AOM_ICDF(21081), AOM_ICDF(22320), AOM_ICDF(23871), AOM_ICDF(25087),
+          AOM_ICDF(29258), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(8704), AOM_ICDF(11148), AOM_ICDF(12499), AOM_ICDF(17340),
+          AOM_ICDF(20656), AOM_ICDF(21288), AOM_ICDF(22588), AOM_ICDF(23701),
+          AOM_ICDF(24693), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7552), AOM_ICDF(11394), AOM_ICDF(12980), AOM_ICDF(15562),
+          AOM_ICDF(19942), AOM_ICDF(21792), AOM_ICDF(25093), AOM_ICDF(28211),
+          AOM_ICDF(28959), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5120), AOM_ICDF(11708), AOM_ICDF(13847), AOM_ICDF(19377),
+          AOM_ICDF(22421), AOM_ICDF(23160), AOM_ICDF(25449), AOM_ICDF(27136),
+          AOM_ICDF(29182), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(9984), AOM_ICDF(12031), AOM_ICDF(15190), AOM_ICDF(18673),
+          AOM_ICDF(21422), AOM_ICDF(22812), AOM_ICDF(25690), AOM_ICDF(29118),
+          AOM_ICDF(30458), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6144), AOM_ICDF(9680), AOM_ICDF(17436), AOM_ICDF(19610),
+          AOM_ICDF(21820), AOM_ICDF(23485), AOM_ICDF(26313), AOM_ICDF(30826),
+          AOM_ICDF(31843), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6016), AOM_ICDF(8315), AOM_ICDF(10607), AOM_ICDF(19333),
+          AOM_ICDF(21572), AOM_ICDF(22553), AOM_ICDF(25266), AOM_ICDF(27288),
+          AOM_ICDF(28551), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7168), AOM_ICDF(9668), AOM_ICDF(12646), AOM_ICDF(16257),
+          AOM_ICDF(19648), AOM_ICDF(20899), AOM_ICDF(25304), AOM_ICDF(30465),
+          AOM_ICDF(31625), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6144), AOM_ICDF(9368), AOM_ICDF(11836), AOM_ICDF(14130),
+          AOM_ICDF(19153), AOM_ICDF(21157), AOM_ICDF(24876), AOM_ICDF(28452),
+          AOM_ICDF(29396), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5504), AOM_ICDF(8486), AOM_ICDF(11996), AOM_ICDF(14412),
+          AOM_ICDF(17968), AOM_ICDF(21814), AOM_ICDF(24424), AOM_ICDF(30682),
+          AOM_ICDF(32059), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5376), AOM_ICDF(7195), AOM_ICDF(9592), AOM_ICDF(13331),
+          AOM_ICDF(17569), AOM_ICDF(19460), AOM_ICDF(22371), AOM_ICDF(25458),
+          AOM_ICDF(28942), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7424), AOM_ICDF(9206), AOM_ICDF(11783), AOM_ICDF(16456),
+          AOM_ICDF(19253), AOM_ICDF(20390), AOM_ICDF(23775), AOM_ICDF(27007),
+          AOM_ICDF(28425), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5888), AOM_ICDF(8303), AOM_ICDF(11361), AOM_ICDF(13440),
+          AOM_ICDF(15848), AOM_ICDF(17549), AOM_ICDF(21532), AOM_ICDF(29564),
+          AOM_ICDF(30665), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4608), AOM_ICDF(8788), AOM_ICDF(13284), AOM_ICDF(16621),
+          AOM_ICDF(18983), AOM_ICDF(20286), AOM_ICDF(24577), AOM_ICDF(28960),
+          AOM_ICDF(30314), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(8320), AOM_ICDF(15005), AOM_ICDF(19168), AOM_ICDF(24282),
+          AOM_ICDF(26707), AOM_ICDF(27402), AOM_ICDF(28681), AOM_ICDF(29639),
+          AOM_ICDF(30629), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5632), AOM_ICDF(13900), AOM_ICDF(22376), AOM_ICDF(24867),
+          AOM_ICDF(26804), AOM_ICDF(27734), AOM_ICDF(29130), AOM_ICDF(30722),
+          AOM_ICDF(31465), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(4992), AOM_ICDF(9115), AOM_ICDF(11055), AOM_ICDF(24893),
+          AOM_ICDF(26316), AOM_ICDF(26661), AOM_ICDF(27663), AOM_ICDF(28301),
+          AOM_ICDF(29418), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(7424), AOM_ICDF(12077), AOM_ICDF(14987), AOM_ICDF(19596),
+          AOM_ICDF(22615), AOM_ICDF(23600), AOM_ICDF(26465), AOM_ICDF(28484),
+          AOM_ICDF(29789), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6272), AOM_ICDF(11447), AOM_ICDF(14362), AOM_ICDF(18204),
+          AOM_ICDF(23418), AOM_ICDF(24715), AOM_ICDF(26697), AOM_ICDF(28547),
+          AOM_ICDF(29520), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5248), AOM_ICDF(10946), AOM_ICDF(15379), AOM_ICDF(18167),
+          AOM_ICDF(22197), AOM_ICDF(25432), AOM_ICDF(27295), AOM_ICDF(30031),
+          AOM_ICDF(30576), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5120), AOM_ICDF(9008), AOM_ICDF(11607), AOM_ICDF(18210),
+          AOM_ICDF(22327), AOM_ICDF(23427), AOM_ICDF(24887), AOM_ICDF(26580),
+          AOM_ICDF(29892), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(6656), AOM_ICDF(10124), AOM_ICDF(12689), AOM_ICDF(19922),
+          AOM_ICDF(22480), AOM_ICDF(22807), AOM_ICDF(24441), AOM_ICDF(25579),
+          AOM_ICDF(26787), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5376), AOM_ICDF(10084), AOM_ICDF(13983), AOM_ICDF(17113),
+          AOM_ICDF(19996), AOM_ICDF(21614), AOM_ICDF(24403), AOM_ICDF(28651),
+          AOM_ICDF(29938), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(5504), AOM_ICDF(14131), AOM_ICDF(17989), AOM_ICDF(23324),
+          AOM_ICDF(25513), AOM_ICDF(26071), AOM_ICDF(27850), AOM_ICDF(29464),
+          AOM_ICDF(30393), AOM_ICDF(32768), 0 } },
 #endif  // CONFIG_ALT_INTRA
     };
 #endif  // CONFIG_EC_MULTISYMBOL
@@ -2863,9 +3295,11 @@
     for (j = 0; j < EXT_PARTITION_TYPES; ++j) {
       int inorder_idx = av1_ext_partition_index_map[j];
       aom_cdf_prob prob =
-          inorder_partition_cdf[inorder_idx] -
-          (inorder_idx > 0 ? inorder_partition_cdf[inorder_idx - 1] : 0);
-      fc->partition_cdf[i][j] = (cum_prob += prob);
+          AOM_ICDF(inorder_partition_cdf[inorder_idx]) -
+          (inorder_idx > 0 ? AOM_ICDF(inorder_partition_cdf[inorder_idx - 1])
+                           : 0);
+      cum_prob += prob;
+      fc->partition_cdf[i][j] = AOM_ICDF(cum_prob);
     }
     assert(cum_prob == CDF_PROB_TOP);
   }
diff --git a/av1/common/entropymv.c b/av1/common/entropymv.c
index 8d011ea..e3aecba 100644
--- a/av1/common/entropymv.c
+++ b/av1/common/entropymv.c
@@ -44,24 +44,29 @@
 static const nmv_context default_nmv_context = {
   { 32, 64, 96 },  // joints
 #if CONFIG_EC_MULTISYMBOL
-  { 4096, 11264, 19328, 32768, 0 },  // joint_cdf
+  { AOM_ICDF(4096), AOM_ICDF(11264), AOM_ICDF(19328), AOM_ICDF(32768),
+    0 },  // joint_cdf
 #endif
   { {
         // Vertical component
         128,                                                   // sign
         { 224, 144, 192, 168, 192, 176, 192, 198, 198, 245 },  // class
 #if CONFIG_EC_MULTISYMBOL
-        { 28672, 30976, 31858, 32320, 32551, 32656, 32740, 32757, 32762, 32767,
-          32768, 0 },  // class_cdf
+        { AOM_ICDF(28672), AOM_ICDF(30976), AOM_ICDF(31858), AOM_ICDF(32320),
+          AOM_ICDF(32551), AOM_ICDF(32656), AOM_ICDF(32740), AOM_ICDF(32757),
+          AOM_ICDF(32762), AOM_ICDF(32767), AOM_ICDF(32768), 0 },  // class_cdf
 #endif
         { 216 },                                               // class0
         { 136, 140, 148, 160, 176, 192, 224, 234, 234, 240 },  // bits
         { { 128, 128, 64 }, { 96, 112, 64 } },                 // class0_fp
         { 64, 96, 64 },                                        // fp
 #if CONFIG_EC_MULTISYMBOL
-        { { 16384, 24576, 26624, 32768, 0 },
-          { 12288, 21248, 24128, 32768, 0 } },  // class0_fp_cdf
-        { 8192, 17408, 21248, 32768, 0 },       // fp_cdf
+        { { AOM_ICDF(16384), AOM_ICDF(24576), AOM_ICDF(26624), AOM_ICDF(32768),
+            0 },
+          { AOM_ICDF(12288), AOM_ICDF(21248), AOM_ICDF(24128), AOM_ICDF(32768),
+            0 } },  // class0_fp_cdf
+        { AOM_ICDF(8192), AOM_ICDF(17408), AOM_ICDF(21248), AOM_ICDF(32768),
+          0 },  // fp_cdf
 #endif
         160,  // class0_hp bit
         128,  // hp
@@ -71,17 +76,21 @@
         128,                                                   // sign
         { 216, 128, 176, 160, 176, 176, 192, 198, 198, 208 },  // class
 #if CONFIG_EC_MULTISYMBOL
-        { 28672, 30976, 31858, 32320, 32551, 32656, 32740, 32757, 32762, 32767,
-          32768, 0 },  // class_cdf
+        { AOM_ICDF(28672), AOM_ICDF(30976), AOM_ICDF(31858), AOM_ICDF(32320),
+          AOM_ICDF(32551), AOM_ICDF(32656), AOM_ICDF(32740), AOM_ICDF(32757),
+          AOM_ICDF(32762), AOM_ICDF(32767), AOM_ICDF(32768), 0 },  // class_cdf
 #endif
         { 208 },                                               // class0
         { 136, 140, 148, 160, 176, 192, 224, 234, 234, 240 },  // bits
         { { 128, 128, 64 }, { 96, 112, 64 } },                 // class0_fp
         { 64, 96, 64 },                                        // fp
 #if CONFIG_EC_MULTISYMBOL
-        { { 16384, 24576, 26624, 32768, 0 },
-          { 12288, 21248, 24128, 32768, 0 } },  // class0_fp_cdf
-        { 8192, 17408, 21248, 32768, 0 },       // fp_cdf
+        { { AOM_ICDF(16384), AOM_ICDF(24576), AOM_ICDF(26624), AOM_ICDF(32768),
+            0 },
+          { AOM_ICDF(12288), AOM_ICDF(21248), AOM_ICDF(24128), AOM_ICDF(32768),
+            0 } },  // class0_fp_cdf
+        { AOM_ICDF(8192), AOM_ICDF(17408), AOM_ICDF(21248), AOM_ICDF(32768),
+          0 },  // fp_cdf
 #endif
         160,  // class0_hp bit
         128,  // hp
diff --git a/av1/common/generic_code.c b/av1/common/generic_code.c
index 76923b1..2955a69 100644
--- a/av1/common/generic_code.c
+++ b/av1/common/generic_code.c
@@ -20,7 +20,7 @@
 void aom_cdf_init_q15_1D(uint16_t *cdf, int nsyms, int cdf_size) {
   int i;
   for (i = 0; i < nsyms; i++)
-    cdf[i] = (i + 1)*CDF_PROB_TOP/nsyms;
+    cdf[i] = AOM_ICDF((i + 1)*CDF_PROB_TOP/nsyms);
 
 #if CONFIG_EC_ADAPT
   cdf[cdf_size - 1] = 0;
@@ -31,7 +31,7 @@
 void aom_cdf_adapt_q15(int val, uint16_t *cdf, int n, int *count, int rate) {
   int i;
   *count = OD_MINI(*count + 1, 1 << rate);
-  OD_ASSERT(cdf[n - 1] == 32768);
+  OD_ASSERT(AOM_ICDF(cdf[n - 1]) == 32768);
   if (*count >= 1 << rate) {
     /* Steady-state adaptation based on a simple IIR with dyadic rate. */
     for (i = 0; i < n; i++) {
@@ -55,7 +55,7 @@
          stored in a lookup table indexed by n and rate to avoid the
          arithmetic. */
       tmp = 2 - (1<<rate) + i + (32767 + (1<<rate) - n)*(i >= val);
-      cdf[i] -= (cdf[i] - tmp) >> rate;
+      cdf[i] = AOM_ICDF(AOM_ICDF(cdf[i]) - ((AOM_ICDF(cdf[i]) - tmp) >> rate));
     }
   }
   else {
@@ -67,10 +67,11 @@
     for (i = 0; i < n; i++) {
       int tmp;
       tmp = (32768 - n)*(i >= val) + i + 1;
-      cdf[i] -= ((cdf[i] - tmp)*alpha) >> 15;
+      cdf[i] = AOM_ICDF(AOM_ICDF(cdf[i])
+          - (((AOM_ICDF(cdf[i]) - tmp)*alpha) >> 15));
     }
   }
-  OD_ASSERT(cdf[n - 1] == 32768);
+  OD_ASSERT(AOM_ICDF(cdf[n - 1]) == 32768);
 }
 
 /** Takes the base-2 log of E(x) in Q1.
diff --git a/av1/common/laplace_tables.c b/av1/common/laplace_tables.c
index f1c3f9a..ab87848 100644
--- a/av1/common/laplace_tables.c
+++ b/av1/common/laplace_tables.c
@@ -6,137 +6,522 @@
 # include "config.h"
 #endif
 
+#include "aom_dsp/prob.h"
 #include "pvq.h"
 
 const uint16_t EXP_CDF_TABLE[128][16] = {
-  {32753,32754,32755,32756,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {32499,32753,32755,32756,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {32243,32747,32755,32756,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {31987,32737,32755,32756,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {31732,32724,32755,32756,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {31476,32706,32754,32756,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {31220,32684,32753,32756,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {30964,32658,32751,32756,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {30708,32628,32748,32756,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {30452,32594,32745,32756,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {30198,32558,32742,32756,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {29941,32515,32736,32755,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {29686,32470,32731,32755,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {29429,32419,32723,32754,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {29174,32366,32715,32753,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {28918,32308,32705,32752,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {28662,32246,32694,32750,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {28406,32180,32681,32748,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {28150,32110,32667,32745,32756,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {27894,32036,32651,32742,32756,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {27639,31959,32634,32739,32755,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {27383,31877,32614,32735,32755,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {27126,31790,32592,32730,32754,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {26871,31701,32569,32725,32753,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {26615,31607,32543,32719,32752,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {26361,31511,32517,32713,32751,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {26104,31408,32485,32704,32748,32757,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {25848,31302,32452,32695,32746,32757,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {25591,31191,32416,32684,32743,32756,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {25336,31078,32379,32674,32741,32756,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {25080,30960,32338,32661,32737,32755,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {24824,30838,32295,32648,32733,32754,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {24568,30712,32248,32632,32728,32752,32758,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {24313,30583,32199,32616,32723,32751,32758,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {24057,30449,32147,32598,32718,32750,32758,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {23801,30311,32091,32578,32711,32747,32757,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {23546,30170,32033,32557,32704,32745,32757,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {23288,30022,31969,32532,32695,32742,32756,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {23033,29873,31904,32507,32686,32739,32755,32760,32761,32762,32763,32764,32765,32766,32767,32768},
-  {22778,29720,31835,32479,32675,32735,32753,32759,32761,32762,32763,32764,32765,32766,32767,32768},
-  {22521,29561,31761,32449,32664,32731,32752,32759,32761,32762,32763,32764,32765,32766,32767,32768},
-  {22267,29401,31686,32418,32652,32727,32751,32759,32761,32762,32763,32764,32765,32766,32767,32768},
-  {22011,29235,31605,32383,32638,32722,32749,32758,32761,32762,32763,32764,32765,32766,32767,32768},
-  {21754,29064,31520,32345,32622,32715,32746,32757,32761,32762,32763,32764,32765,32766,32767,32768},
-  {21501,28893,31434,32307,32607,32710,32745,32757,32761,32762,32763,32764,32765,32766,32767,32768},
-  {21243,28713,31339,32262,32587,32701,32741,32755,32760,32762,32763,32764,32765,32766,32767,32768},
-  {20988,28532,31243,32217,32567,32693,32738,32754,32760,32762,32763,32764,32765,32766,32767,32768},
-  {20730,28344,31140,32167,32544,32682,32733,32752,32759,32762,32763,32764,32765,32766,32767,32768},
-  {20476,28156,31036,32116,32521,32673,32730,32751,32759,32762,32763,32764,32765,32766,32767,32768},
-  {20220,27962,30926,32061,32495,32661,32725,32749,32758,32762,32763,32764,32765,32766,32767,32768},
-  {19963,27763,30810,32000,32465,32647,32718,32746,32757,32761,32763,32764,32765,32766,32767,32768},
-  {19708,27562,30691,31938,32435,32633,32712,32743,32756,32761,32763,32764,32765,32766,32767,32768},
-  {19454,27358,30569,31873,32403,32618,32705,32741,32755,32761,32763,32764,32765,32766,32767,32768},
-  {19196,27146,30438,31801,32365,32599,32696,32736,32753,32760,32763,32764,32765,32766,32767,32768},
-  {18942,26934,30306,31728,32328,32581,32688,32733,32752,32760,32763,32764,32765,32766,32767,32768},
-  {18684,26714,30164,31647,32284,32558,32676,32727,32749,32758,32762,32764,32765,32766,32767,32768},
-  {18429,26493,30021,31565,32240,32535,32664,32721,32746,32757,32762,32764,32765,32766,32767,32768},
-  {18174,26268,29872,31477,32192,32510,32652,32715,32743,32756,32762,32764,32765,32766,32767,32768},
-  {17920,26040,29719,31386,32141,32483,32638,32708,32740,32754,32761,32764,32765,32766,32767,32768},
-  {17661,25803,29556,31286,32083,32451,32620,32698,32734,32751,32759,32763,32765,32766,32767,32768},
-  {17406,25566,29391,31184,32024,32418,32603,32690,32731,32750,32759,32763,32765,32766,32767,32768},
-  {17151,25325,29220,31076,31961,32383,32584,32680,32726,32748,32758,32763,32765,32766,32767,32768},
-  {16896,25080,29044,30964,31894,32344,32562,32668,32719,32744,32756,32762,32765,32766,32767,32768},
-  {16639,24829,28860,30844,31821,32302,32539,32655,32712,32740,32754,32761,32764,32766,32767,32768},
-  {16384,24576,28672,30720,31744,32256,32512,32640,32704,32736,32752,32760,32764,32766,32767,32768},
-  {16130,24320,28479,30591,31663,32208,32485,32625,32696,32732,32750,32759,32764,32766,32767,32768},
-  {15872,24056,28276,30452,31574,32152,32450,32604,32683,32724,32745,32756,32762,32765,32766,32768},
-  {15615,23789,28068,30308,31480,32094,32415,32583,32671,32717,32741,32754,32761,32764,32766,32768},
-  {15361,23521,27856,30159,31382,32032,32377,32560,32657,32709,32737,32752,32760,32764,32766,32768},
-  {15103,23245,27634,30000,31275,31963,32334,32534,32642,32700,32731,32748,32757,32762,32765,32768},
-  {14848,22968,27409,29837,31165,31891,32288,32505,32624,32689,32725,32744,32755,32761,32764,32768},
-  {14592,22686,27176,29666,31047,31813,32238,32474,32605,32678,32718,32740,32752,32759,32763,32768},
-  {14336,22400,26936,29488,30923,31730,32184,32439,32583,32664,32709,32735,32749,32757,32762,32768},
-  {14079,22109,26689,29301,30791,31641,32125,32401,32559,32649,32700,32729,32746,32756,32761,32768},
-  {13825,21817,26437,29108,30652,31545,32061,32359,32532,32632,32690,32723,32742,32753,32759,32768},
-  {13568,21518,26176,28905,30504,31441,31990,32312,32501,32611,32676,32714,32736,32749,32757,32768},
-  {13314,21218,25911,28697,30351,31333,31916,32262,32468,32590,32662,32705,32731,32746,32755,32768},
-  {13054,20908,25633,28475,30185,31214,31833,32205,32429,32564,32645,32694,32723,32741,32752,32768},
-  {12803,20603,25356,28252,30017,31093,31748,32147,32390,32538,32628,32683,32717,32737,32749,32768},
-  {12544,20286,25064,28013,29833,30956,31649,32077,32341,32504,32605,32667,32705,32729,32744,32768},
-  {12288,19968,24768,27768,29643,30815,31547,32005,32291,32470,32582,32652,32696,32723,32740,32768},
-  {12033,19647,24465,27514,29443,30664,31437,31926,32235,32431,32555,32633,32683,32714,32734,32768},
-  {11777,19321,24154,27250,29233,30504,31318,31839,32173,32387,32524,32612,32668,32704,32727,32768},
-  {11521,18991,23835,26976,29013,30334,31190,31745,32105,32338,32489,32587,32651,32692,32719,32768},
-  {11265,18657,23508,26691,28780,30151,31051,31641,32028,32282,32449,32559,32631,32678,32709,32768},
-  {11006,18316,23170,26394,28535,29957,30901,31528,31944,32220,32404,32526,32607,32661,32697,32768},
-  {10752,17976,22830,26091,28282,29754,30743,31408,31854,32154,32356,32491,32582,32643,32684,32768},
-  {10496,17630,22479,25775,28015,29538,30573,31276,31754,32079,32300,32450,32552,32621,32668,32768},
-  {10240,17280,22120,25448,27736,29309,30390,31133,31644,31995,32237,32403,32517,32595,32649,32768},
-  { 9984,16926,21753,25109,27443,29066,30194,30978,31523,31902,32166,32349,32476,32565,32627,32768},
-  { 9728,16568,21377,24759,27137,28809,29984,30811,31392,31801,32088,32290,32432,32532,32602,32768},
-  { 9474,16208,20995,24399,26819,28539,29762,30631,31249,31688,32000,32222,32380,32492,32572,32768},
-  { 9216,15840,20601,24023,26483,28251,29522,30435,31091,31563,31902,32146,32321,32447,32537,32768},
-  { 8959,15469,20199,23636,26133,27947,29265,30223,30919,31425,31792,32059,32253,32394,32496,32768},
-  { 8705,15097,19791,23238,25770,27629,28994,29997,30733,31274,31671,31963,32177,32334,32449,32768},
-  { 8449,14719,19373,22827,25390,27292,28704,29752,30530,31107,31535,31853,32089,32264,32394,32768},
-  { 8192,14336,18944,22400,24992,26936,28394,29488,30308,30923,31384,31730,31989,32184,32330,32768},
-  { 7936,13950,18507,21961,24578,26561,28064,29203,30066,30720,31216,31592,31877,32093,32256,32768},
-  { 7678,13558,18060,21507,24146,26166,27713,28897,29804,30498,31030,31437,31749,31988,32171,32768},
-  { 7423,13165,17606,21041,23698,25753,27342,28571,29522,30257,30826,31266,31606,31869,32073,32768},
-  { 7168,12768,17143,20561,23231,25317,26947,28220,29215,29992,30599,31073,31444,31734,31960,32768},
-  { 6911,12365,16669,20065,22744,24858,26526,27842,28881,29701,30348,30858,31261,31579,31830,32768},
-  { 6657,11961,16188,19556,22240,24379,26083,27441,28523,29385,30072,30620,31056,31404,31681,32768},
-  { 6400,11550,15694,19029,21712,23871,25609,27007,28132,29037,29766,30352,30824,31204,31509,32768},
-  { 6142,11134,15190,18486,21164,23340,25108,26544,27711,28659,29429,30055,30564,30977,31313,32768},
-  { 5890,10720,14682,17932,20598,22785,24579,26051,27258,28248,29060,29726,30273,30721,31089,32768},
-  { 5631,10295,14157,17356,20005,22199,24016,25520,26766,27798,28652,29359,29945,30430,30832,32768},
-  { 5377, 9871,13628,16768,19393,21587,23421,24954,26236,27308,28204,28953,29579,30102,30539,32768},
-  { 5121, 9441,13086,16161,18756,20945,22792,24351,25666,26776,27712,28502,29169,29731,30206,32768},
-  { 4865, 9007,12534,15538,18096,20274,22129,23708,25053,26198,27173,28004,28711,29313,29826,32768},
-  { 4608, 8568,11971,14896,17409,19569,21425,23020,24391,25569,26581,27451,28199,28842,29394,32768},
-  { 4351, 8125,11398,14236,16697,18831,20682,22287,23679,24886,25933,26841,27628,28311,28903,32768},
-  { 4096, 7680,10816,13560,15961,18062,19900,21508,22915,24146,25224,26167,26992,27714,28346,32768},
-  { 3840, 7230,10223,12865,15197,17256,19074,20679,22096,23347,24451,25426,26287,27047,27718,32768},
-  { 3584, 6776, 9619,12151,14406,16414,18203,19796,21215,22479,23604,24606,25499,26294,27002,32768},
-  { 3328, 6318, 9004,11417,13585,15533,17283,18856,20269,21538,22678,23703,24624,25451,26194,32768},
-  { 3072, 5856, 8379,10665,12737,14615,16317,17859,19257,20524,21672,22712,23655,24509,25283,32768},
-  { 2816, 5390, 7743, 9894,11860,13657,15299,16800,18172,19426,20573,21621,22579,23455,24255,32768},
-  { 2560, 4920, 7096, 9102,10951,12656,14227,15676,17011,18242,19377,20423,21388,22277,23097,32768},
-  { 2304, 4446, 6437, 8288,10009,11609,13097,14480,15766,16961,18072,19105,20066,20959,21789,32768},
-  { 2048, 3968, 5768, 7456, 9038,10521,11911,13215,14437,15583,16657,17664,18608,19493,20323,32768},
-  { 1792, 3486, 5087, 6601, 8032, 9385,10664,11873,13016,14096,15117,16082,16995,17858,18673,32768},
-  { 1536, 3000, 4395, 5725, 6993, 8201, 9353,10451,11497,12494,13444,14350,15213,16036,16820,32768},
-  { 1280, 2510, 3692, 4828, 5919, 6968, 7976, 8944, 9875,10769,11628,12454,13248,14011,14744,32768},
-  { 1024, 2016, 2977, 3908, 4810, 5684, 6530, 7350, 8144, 8913, 9658,10380,11080,11758,12415,32768},
-  {  768, 1518, 2250, 2965, 3663, 4345, 5011, 5662, 6297, 6917, 7523, 8115, 8693, 9257, 9808,32768},
-  {  512, 1016, 1512, 2000, 2481, 2954, 3420, 3879, 4330, 4774, 5211, 5642, 6066, 6483, 6894,32768},
-  {  256,  510,  762, 1012, 1260, 1506, 1750, 1992, 2232, 2471, 2708, 2943, 3176, 3407, 3636,32768},
+  {AOM_ICDF(32753), AOM_ICDF(32754), AOM_ICDF(32755), AOM_ICDF(32756),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(32499), AOM_ICDF(32753), AOM_ICDF(32755), AOM_ICDF(32756),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(32243), AOM_ICDF(32747), AOM_ICDF(32755), AOM_ICDF(32756),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(31987), AOM_ICDF(32737), AOM_ICDF(32755), AOM_ICDF(32756),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(31732), AOM_ICDF(32724), AOM_ICDF(32755), AOM_ICDF(32756),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(31476), AOM_ICDF(32706), AOM_ICDF(32754), AOM_ICDF(32756),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(31220), AOM_ICDF(32684), AOM_ICDF(32753), AOM_ICDF(32756),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(30964), AOM_ICDF(32658), AOM_ICDF(32751), AOM_ICDF(32756),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(30708), AOM_ICDF(32628), AOM_ICDF(32748), AOM_ICDF(32756),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(30452), AOM_ICDF(32594), AOM_ICDF(32745), AOM_ICDF(32756),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(30198), AOM_ICDF(32558), AOM_ICDF(32742), AOM_ICDF(32756),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(29941), AOM_ICDF(32515), AOM_ICDF(32736), AOM_ICDF(32755),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(29686), AOM_ICDF(32470), AOM_ICDF(32731), AOM_ICDF(32755),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(29429), AOM_ICDF(32419), AOM_ICDF(32723), AOM_ICDF(32754),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(29174), AOM_ICDF(32366), AOM_ICDF(32715), AOM_ICDF(32753),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(28918), AOM_ICDF(32308), AOM_ICDF(32705), AOM_ICDF(32752),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(28662), AOM_ICDF(32246), AOM_ICDF(32694), AOM_ICDF(32750),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(28406), AOM_ICDF(32180), AOM_ICDF(32681), AOM_ICDF(32748),
+    AOM_ICDF(32757), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(28150), AOM_ICDF(32110), AOM_ICDF(32667), AOM_ICDF(32745),
+    AOM_ICDF(32756), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(27894), AOM_ICDF(32036), AOM_ICDF(32651), AOM_ICDF(32742),
+    AOM_ICDF(32756), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(27639), AOM_ICDF(31959), AOM_ICDF(32634), AOM_ICDF(32739),
+    AOM_ICDF(32755), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(27383), AOM_ICDF(31877), AOM_ICDF(32614), AOM_ICDF(32735),
+    AOM_ICDF(32755), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(27126), AOM_ICDF(31790), AOM_ICDF(32592), AOM_ICDF(32730),
+    AOM_ICDF(32754), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(26871), AOM_ICDF(31701), AOM_ICDF(32569), AOM_ICDF(32725),
+    AOM_ICDF(32753), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(26615), AOM_ICDF(31607), AOM_ICDF(32543), AOM_ICDF(32719),
+    AOM_ICDF(32752), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(26361), AOM_ICDF(31511), AOM_ICDF(32517), AOM_ICDF(32713),
+    AOM_ICDF(32751), AOM_ICDF(32758), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(26104), AOM_ICDF(31408), AOM_ICDF(32485), AOM_ICDF(32704),
+    AOM_ICDF(32748), AOM_ICDF(32757), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(25848), AOM_ICDF(31302), AOM_ICDF(32452), AOM_ICDF(32695),
+    AOM_ICDF(32746), AOM_ICDF(32757), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(25591), AOM_ICDF(31191), AOM_ICDF(32416), AOM_ICDF(32684),
+    AOM_ICDF(32743), AOM_ICDF(32756), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(25336), AOM_ICDF(31078), AOM_ICDF(32379), AOM_ICDF(32674),
+    AOM_ICDF(32741), AOM_ICDF(32756), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(25080), AOM_ICDF(30960), AOM_ICDF(32338), AOM_ICDF(32661),
+    AOM_ICDF(32737), AOM_ICDF(32755), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(24824), AOM_ICDF(30838), AOM_ICDF(32295), AOM_ICDF(32648),
+    AOM_ICDF(32733), AOM_ICDF(32754), AOM_ICDF(32759), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(24568), AOM_ICDF(30712), AOM_ICDF(32248), AOM_ICDF(32632),
+    AOM_ICDF(32728), AOM_ICDF(32752), AOM_ICDF(32758), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(24313), AOM_ICDF(30583), AOM_ICDF(32199), AOM_ICDF(32616),
+    AOM_ICDF(32723), AOM_ICDF(32751), AOM_ICDF(32758), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(24057), AOM_ICDF(30449), AOM_ICDF(32147), AOM_ICDF(32598),
+    AOM_ICDF(32718), AOM_ICDF(32750), AOM_ICDF(32758), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(23801), AOM_ICDF(30311), AOM_ICDF(32091), AOM_ICDF(32578),
+    AOM_ICDF(32711), AOM_ICDF(32747), AOM_ICDF(32757), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(23546), AOM_ICDF(30170), AOM_ICDF(32033), AOM_ICDF(32557),
+    AOM_ICDF(32704), AOM_ICDF(32745), AOM_ICDF(32757), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(23288), AOM_ICDF(30022), AOM_ICDF(31969), AOM_ICDF(32532),
+    AOM_ICDF(32695), AOM_ICDF(32742), AOM_ICDF(32756), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(23033), AOM_ICDF(29873), AOM_ICDF(31904), AOM_ICDF(32507),
+    AOM_ICDF(32686), AOM_ICDF(32739), AOM_ICDF(32755), AOM_ICDF(32760),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(22778), AOM_ICDF(29720), AOM_ICDF(31835), AOM_ICDF(32479),
+    AOM_ICDF(32675), AOM_ICDF(32735), AOM_ICDF(32753), AOM_ICDF(32759),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(22521), AOM_ICDF(29561), AOM_ICDF(31761), AOM_ICDF(32449),
+    AOM_ICDF(32664), AOM_ICDF(32731), AOM_ICDF(32752), AOM_ICDF(32759),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(22267), AOM_ICDF(29401), AOM_ICDF(31686), AOM_ICDF(32418),
+    AOM_ICDF(32652), AOM_ICDF(32727), AOM_ICDF(32751), AOM_ICDF(32759),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(22011), AOM_ICDF(29235), AOM_ICDF(31605), AOM_ICDF(32383),
+    AOM_ICDF(32638), AOM_ICDF(32722), AOM_ICDF(32749), AOM_ICDF(32758),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(21754), AOM_ICDF(29064), AOM_ICDF(31520), AOM_ICDF(32345),
+    AOM_ICDF(32622), AOM_ICDF(32715), AOM_ICDF(32746), AOM_ICDF(32757),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(21501), AOM_ICDF(28893), AOM_ICDF(31434), AOM_ICDF(32307),
+    AOM_ICDF(32607), AOM_ICDF(32710), AOM_ICDF(32745), AOM_ICDF(32757),
+    AOM_ICDF(32761), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(21243), AOM_ICDF(28713), AOM_ICDF(31339), AOM_ICDF(32262),
+    AOM_ICDF(32587), AOM_ICDF(32701), AOM_ICDF(32741), AOM_ICDF(32755),
+    AOM_ICDF(32760), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(20988), AOM_ICDF(28532), AOM_ICDF(31243), AOM_ICDF(32217),
+    AOM_ICDF(32567), AOM_ICDF(32693), AOM_ICDF(32738), AOM_ICDF(32754),
+    AOM_ICDF(32760), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(20730), AOM_ICDF(28344), AOM_ICDF(31140), AOM_ICDF(32167),
+    AOM_ICDF(32544), AOM_ICDF(32682), AOM_ICDF(32733), AOM_ICDF(32752),
+    AOM_ICDF(32759), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(20476), AOM_ICDF(28156), AOM_ICDF(31036), AOM_ICDF(32116),
+    AOM_ICDF(32521), AOM_ICDF(32673), AOM_ICDF(32730), AOM_ICDF(32751),
+    AOM_ICDF(32759), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(20220), AOM_ICDF(27962), AOM_ICDF(30926), AOM_ICDF(32061),
+    AOM_ICDF(32495), AOM_ICDF(32661), AOM_ICDF(32725), AOM_ICDF(32749),
+    AOM_ICDF(32758), AOM_ICDF(32762), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(19963), AOM_ICDF(27763), AOM_ICDF(30810), AOM_ICDF(32000),
+    AOM_ICDF(32465), AOM_ICDF(32647), AOM_ICDF(32718), AOM_ICDF(32746),
+    AOM_ICDF(32757), AOM_ICDF(32761), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(19708), AOM_ICDF(27562), AOM_ICDF(30691), AOM_ICDF(31938),
+    AOM_ICDF(32435), AOM_ICDF(32633), AOM_ICDF(32712), AOM_ICDF(32743),
+    AOM_ICDF(32756), AOM_ICDF(32761), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(19454), AOM_ICDF(27358), AOM_ICDF(30569), AOM_ICDF(31873),
+    AOM_ICDF(32403), AOM_ICDF(32618), AOM_ICDF(32705), AOM_ICDF(32741),
+    AOM_ICDF(32755), AOM_ICDF(32761), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(19196), AOM_ICDF(27146), AOM_ICDF(30438), AOM_ICDF(31801),
+    AOM_ICDF(32365), AOM_ICDF(32599), AOM_ICDF(32696), AOM_ICDF(32736),
+    AOM_ICDF(32753), AOM_ICDF(32760), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(18942), AOM_ICDF(26934), AOM_ICDF(30306), AOM_ICDF(31728),
+    AOM_ICDF(32328), AOM_ICDF(32581), AOM_ICDF(32688), AOM_ICDF(32733),
+    AOM_ICDF(32752), AOM_ICDF(32760), AOM_ICDF(32763), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(18684), AOM_ICDF(26714), AOM_ICDF(30164), AOM_ICDF(31647),
+    AOM_ICDF(32284), AOM_ICDF(32558), AOM_ICDF(32676), AOM_ICDF(32727),
+    AOM_ICDF(32749), AOM_ICDF(32758), AOM_ICDF(32762), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(18429), AOM_ICDF(26493), AOM_ICDF(30021), AOM_ICDF(31565),
+    AOM_ICDF(32240), AOM_ICDF(32535), AOM_ICDF(32664), AOM_ICDF(32721),
+    AOM_ICDF(32746), AOM_ICDF(32757), AOM_ICDF(32762), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(18174), AOM_ICDF(26268), AOM_ICDF(29872), AOM_ICDF(31477),
+    AOM_ICDF(32192), AOM_ICDF(32510), AOM_ICDF(32652), AOM_ICDF(32715),
+    AOM_ICDF(32743), AOM_ICDF(32756), AOM_ICDF(32762), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(17920), AOM_ICDF(26040), AOM_ICDF(29719), AOM_ICDF(31386),
+    AOM_ICDF(32141), AOM_ICDF(32483), AOM_ICDF(32638), AOM_ICDF(32708),
+    AOM_ICDF(32740), AOM_ICDF(32754), AOM_ICDF(32761), AOM_ICDF(32764),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(17661), AOM_ICDF(25803), AOM_ICDF(29556), AOM_ICDF(31286),
+    AOM_ICDF(32083), AOM_ICDF(32451), AOM_ICDF(32620), AOM_ICDF(32698),
+    AOM_ICDF(32734), AOM_ICDF(32751), AOM_ICDF(32759), AOM_ICDF(32763),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(17406), AOM_ICDF(25566), AOM_ICDF(29391), AOM_ICDF(31184),
+    AOM_ICDF(32024), AOM_ICDF(32418), AOM_ICDF(32603), AOM_ICDF(32690),
+    AOM_ICDF(32731), AOM_ICDF(32750), AOM_ICDF(32759), AOM_ICDF(32763),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(17151), AOM_ICDF(25325), AOM_ICDF(29220), AOM_ICDF(31076),
+    AOM_ICDF(31961), AOM_ICDF(32383), AOM_ICDF(32584), AOM_ICDF(32680),
+    AOM_ICDF(32726), AOM_ICDF(32748), AOM_ICDF(32758), AOM_ICDF(32763),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(16896), AOM_ICDF(25080), AOM_ICDF(29044), AOM_ICDF(30964),
+    AOM_ICDF(31894), AOM_ICDF(32344), AOM_ICDF(32562), AOM_ICDF(32668),
+    AOM_ICDF(32719), AOM_ICDF(32744), AOM_ICDF(32756), AOM_ICDF(32762),
+    AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(16639), AOM_ICDF(24829), AOM_ICDF(28860), AOM_ICDF(30844),
+    AOM_ICDF(31821), AOM_ICDF(32302), AOM_ICDF(32539), AOM_ICDF(32655),
+    AOM_ICDF(32712), AOM_ICDF(32740), AOM_ICDF(32754), AOM_ICDF(32761),
+    AOM_ICDF(32764), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(16384), AOM_ICDF(24576), AOM_ICDF(28672), AOM_ICDF(30720),
+    AOM_ICDF(31744), AOM_ICDF(32256), AOM_ICDF(32512), AOM_ICDF(32640),
+    AOM_ICDF(32704), AOM_ICDF(32736), AOM_ICDF(32752), AOM_ICDF(32760),
+    AOM_ICDF(32764), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(16130), AOM_ICDF(24320), AOM_ICDF(28479), AOM_ICDF(30591),
+    AOM_ICDF(31663), AOM_ICDF(32208), AOM_ICDF(32485), AOM_ICDF(32625),
+    AOM_ICDF(32696), AOM_ICDF(32732), AOM_ICDF(32750), AOM_ICDF(32759),
+    AOM_ICDF(32764), AOM_ICDF(32766), AOM_ICDF(32767), AOM_ICDF(32768)},
+  {AOM_ICDF(15872), AOM_ICDF(24056), AOM_ICDF(28276), AOM_ICDF(30452),
+    AOM_ICDF(31574), AOM_ICDF(32152), AOM_ICDF(32450), AOM_ICDF(32604),
+    AOM_ICDF(32683), AOM_ICDF(32724), AOM_ICDF(32745), AOM_ICDF(32756),
+    AOM_ICDF(32762), AOM_ICDF(32765), AOM_ICDF(32766), AOM_ICDF(32768)},
+  {AOM_ICDF(15615), AOM_ICDF(23789), AOM_ICDF(28068), AOM_ICDF(30308),
+    AOM_ICDF(31480), AOM_ICDF(32094), AOM_ICDF(32415), AOM_ICDF(32583),
+    AOM_ICDF(32671), AOM_ICDF(32717), AOM_ICDF(32741), AOM_ICDF(32754),
+    AOM_ICDF(32761), AOM_ICDF(32764), AOM_ICDF(32766), AOM_ICDF(32768)},
+  {AOM_ICDF(15361), AOM_ICDF(23521), AOM_ICDF(27856), AOM_ICDF(30159),
+    AOM_ICDF(31382), AOM_ICDF(32032), AOM_ICDF(32377), AOM_ICDF(32560),
+    AOM_ICDF(32657), AOM_ICDF(32709), AOM_ICDF(32737), AOM_ICDF(32752),
+    AOM_ICDF(32760), AOM_ICDF(32764), AOM_ICDF(32766), AOM_ICDF(32768)},
+  {AOM_ICDF(15103), AOM_ICDF(23245), AOM_ICDF(27634), AOM_ICDF(30000),
+    AOM_ICDF(31275), AOM_ICDF(31963), AOM_ICDF(32334), AOM_ICDF(32534),
+    AOM_ICDF(32642), AOM_ICDF(32700), AOM_ICDF(32731), AOM_ICDF(32748),
+    AOM_ICDF(32757), AOM_ICDF(32762), AOM_ICDF(32765), AOM_ICDF(32768)},
+  {AOM_ICDF(14848), AOM_ICDF(22968), AOM_ICDF(27409), AOM_ICDF(29837),
+    AOM_ICDF(31165), AOM_ICDF(31891), AOM_ICDF(32288), AOM_ICDF(32505),
+    AOM_ICDF(32624), AOM_ICDF(32689), AOM_ICDF(32725), AOM_ICDF(32744),
+    AOM_ICDF(32755), AOM_ICDF(32761), AOM_ICDF(32764), AOM_ICDF(32768)},
+  {AOM_ICDF(14592), AOM_ICDF(22686), AOM_ICDF(27176), AOM_ICDF(29666),
+    AOM_ICDF(31047), AOM_ICDF(31813), AOM_ICDF(32238), AOM_ICDF(32474),
+    AOM_ICDF(32605), AOM_ICDF(32678), AOM_ICDF(32718), AOM_ICDF(32740),
+    AOM_ICDF(32752), AOM_ICDF(32759), AOM_ICDF(32763), AOM_ICDF(32768)},
+  {AOM_ICDF(14336), AOM_ICDF(22400), AOM_ICDF(26936), AOM_ICDF(29488),
+    AOM_ICDF(30923), AOM_ICDF(31730), AOM_ICDF(32184), AOM_ICDF(32439),
+    AOM_ICDF(32583), AOM_ICDF(32664), AOM_ICDF(32709), AOM_ICDF(32735),
+    AOM_ICDF(32749), AOM_ICDF(32757), AOM_ICDF(32762), AOM_ICDF(32768)},
+  {AOM_ICDF(14079), AOM_ICDF(22109), AOM_ICDF(26689), AOM_ICDF(29301),
+    AOM_ICDF(30791), AOM_ICDF(31641), AOM_ICDF(32125), AOM_ICDF(32401),
+    AOM_ICDF(32559), AOM_ICDF(32649), AOM_ICDF(32700), AOM_ICDF(32729),
+    AOM_ICDF(32746), AOM_ICDF(32756), AOM_ICDF(32761), AOM_ICDF(32768)},
+  {AOM_ICDF(13825), AOM_ICDF(21817), AOM_ICDF(26437), AOM_ICDF(29108),
+    AOM_ICDF(30652), AOM_ICDF(31545), AOM_ICDF(32061), AOM_ICDF(32359),
+    AOM_ICDF(32532), AOM_ICDF(32632), AOM_ICDF(32690), AOM_ICDF(32723),
+    AOM_ICDF(32742), AOM_ICDF(32753), AOM_ICDF(32759), AOM_ICDF(32768)},
+  {AOM_ICDF(13568), AOM_ICDF(21518), AOM_ICDF(26176), AOM_ICDF(28905),
+    AOM_ICDF(30504), AOM_ICDF(31441), AOM_ICDF(31990), AOM_ICDF(32312),
+    AOM_ICDF(32501), AOM_ICDF(32611), AOM_ICDF(32676), AOM_ICDF(32714),
+    AOM_ICDF(32736), AOM_ICDF(32749), AOM_ICDF(32757), AOM_ICDF(32768)},
+  {AOM_ICDF(13314), AOM_ICDF(21218), AOM_ICDF(25911), AOM_ICDF(28697),
+    AOM_ICDF(30351), AOM_ICDF(31333), AOM_ICDF(31916), AOM_ICDF(32262),
+    AOM_ICDF(32468), AOM_ICDF(32590), AOM_ICDF(32662), AOM_ICDF(32705),
+    AOM_ICDF(32731), AOM_ICDF(32746), AOM_ICDF(32755), AOM_ICDF(32768)},
+  {AOM_ICDF(13054), AOM_ICDF(20908), AOM_ICDF(25633), AOM_ICDF(28475),
+    AOM_ICDF(30185), AOM_ICDF(31214), AOM_ICDF(31833), AOM_ICDF(32205),
+    AOM_ICDF(32429), AOM_ICDF(32564), AOM_ICDF(32645), AOM_ICDF(32694),
+    AOM_ICDF(32723), AOM_ICDF(32741), AOM_ICDF(32752), AOM_ICDF(32768)},
+  {AOM_ICDF(12803), AOM_ICDF(20603), AOM_ICDF(25356), AOM_ICDF(28252),
+    AOM_ICDF(30017), AOM_ICDF(31093), AOM_ICDF(31748), AOM_ICDF(32147),
+    AOM_ICDF(32390), AOM_ICDF(32538), AOM_ICDF(32628), AOM_ICDF(32683),
+    AOM_ICDF(32717), AOM_ICDF(32737), AOM_ICDF(32749), AOM_ICDF(32768)},
+  {AOM_ICDF(12544), AOM_ICDF(20286), AOM_ICDF(25064), AOM_ICDF(28013),
+    AOM_ICDF(29833), AOM_ICDF(30956), AOM_ICDF(31649), AOM_ICDF(32077),
+    AOM_ICDF(32341), AOM_ICDF(32504), AOM_ICDF(32605), AOM_ICDF(32667),
+    AOM_ICDF(32705), AOM_ICDF(32729), AOM_ICDF(32744), AOM_ICDF(32768)},
+  {AOM_ICDF(12288), AOM_ICDF(19968), AOM_ICDF(24768), AOM_ICDF(27768),
+    AOM_ICDF(29643), AOM_ICDF(30815), AOM_ICDF(31547), AOM_ICDF(32005),
+    AOM_ICDF(32291), AOM_ICDF(32470), AOM_ICDF(32582), AOM_ICDF(32652),
+    AOM_ICDF(32696), AOM_ICDF(32723), AOM_ICDF(32740), AOM_ICDF(32768)},
+  {AOM_ICDF(12033), AOM_ICDF(19647), AOM_ICDF(24465), AOM_ICDF(27514),
+    AOM_ICDF(29443), AOM_ICDF(30664), AOM_ICDF(31437), AOM_ICDF(31926),
+    AOM_ICDF(32235), AOM_ICDF(32431), AOM_ICDF(32555), AOM_ICDF(32633),
+    AOM_ICDF(32683), AOM_ICDF(32714), AOM_ICDF(32734), AOM_ICDF(32768)},
+  {AOM_ICDF(11777), AOM_ICDF(19321), AOM_ICDF(24154), AOM_ICDF(27250),
+    AOM_ICDF(29233), AOM_ICDF(30504), AOM_ICDF(31318), AOM_ICDF(31839),
+    AOM_ICDF(32173), AOM_ICDF(32387), AOM_ICDF(32524), AOM_ICDF(32612),
+    AOM_ICDF(32668), AOM_ICDF(32704), AOM_ICDF(32727), AOM_ICDF(32768)},
+  {AOM_ICDF(11521), AOM_ICDF(18991), AOM_ICDF(23835), AOM_ICDF(26976),
+    AOM_ICDF(29013), AOM_ICDF(30334), AOM_ICDF(31190), AOM_ICDF(31745),
+    AOM_ICDF(32105), AOM_ICDF(32338), AOM_ICDF(32489), AOM_ICDF(32587),
+    AOM_ICDF(32651), AOM_ICDF(32692), AOM_ICDF(32719), AOM_ICDF(32768)},
+  {AOM_ICDF(11265), AOM_ICDF(18657), AOM_ICDF(23508), AOM_ICDF(26691),
+    AOM_ICDF(28780), AOM_ICDF(30151), AOM_ICDF(31051), AOM_ICDF(31641),
+    AOM_ICDF(32028), AOM_ICDF(32282), AOM_ICDF(32449), AOM_ICDF(32559),
+    AOM_ICDF(32631), AOM_ICDF(32678), AOM_ICDF(32709), AOM_ICDF(32768)},
+  {AOM_ICDF(11006), AOM_ICDF(18316), AOM_ICDF(23170), AOM_ICDF(26394),
+    AOM_ICDF(28535), AOM_ICDF(29957), AOM_ICDF(30901), AOM_ICDF(31528),
+    AOM_ICDF(31944), AOM_ICDF(32220), AOM_ICDF(32404), AOM_ICDF(32526),
+    AOM_ICDF(32607), AOM_ICDF(32661), AOM_ICDF(32697), AOM_ICDF(32768)},
+  {AOM_ICDF(10752), AOM_ICDF(17976), AOM_ICDF(22830), AOM_ICDF(26091),
+    AOM_ICDF(28282), AOM_ICDF(29754), AOM_ICDF(30743), AOM_ICDF(31408),
+    AOM_ICDF(31854), AOM_ICDF(32154), AOM_ICDF(32356), AOM_ICDF(32491),
+    AOM_ICDF(32582), AOM_ICDF(32643), AOM_ICDF(32684), AOM_ICDF(32768)},
+  {AOM_ICDF(10496), AOM_ICDF(17630), AOM_ICDF(22479), AOM_ICDF(25775),
+    AOM_ICDF(28015), AOM_ICDF(29538), AOM_ICDF(30573), AOM_ICDF(31276),
+    AOM_ICDF(31754), AOM_ICDF(32079), AOM_ICDF(32300), AOM_ICDF(32450),
+    AOM_ICDF(32552), AOM_ICDF(32621), AOM_ICDF(32668), AOM_ICDF(32768)},
+  {AOM_ICDF(10240), AOM_ICDF(17280), AOM_ICDF(22120), AOM_ICDF(25448),
+    AOM_ICDF(27736), AOM_ICDF(29309), AOM_ICDF(30390), AOM_ICDF(31133),
+    AOM_ICDF(31644), AOM_ICDF(31995), AOM_ICDF(32237), AOM_ICDF(32403),
+    AOM_ICDF(32517), AOM_ICDF(32595), AOM_ICDF(32649), AOM_ICDF(32768)},
+  { AOM_ICDF(9984), AOM_ICDF(16926), AOM_ICDF(21753), AOM_ICDF(25109),
+    AOM_ICDF(27443), AOM_ICDF(29066), AOM_ICDF(30194), AOM_ICDF(30978),
+    AOM_ICDF(31523), AOM_ICDF(31902), AOM_ICDF(32166), AOM_ICDF(32349),
+    AOM_ICDF(32476), AOM_ICDF(32565), AOM_ICDF(32627), AOM_ICDF(32768)},
+  { AOM_ICDF(9728), AOM_ICDF(16568), AOM_ICDF(21377), AOM_ICDF(24759),
+    AOM_ICDF(27137), AOM_ICDF(28809), AOM_ICDF(29984), AOM_ICDF(30811),
+    AOM_ICDF(31392), AOM_ICDF(31801), AOM_ICDF(32088), AOM_ICDF(32290),
+    AOM_ICDF(32432), AOM_ICDF(32532), AOM_ICDF(32602), AOM_ICDF(32768)},
+  { AOM_ICDF(9474), AOM_ICDF(16208), AOM_ICDF(20995), AOM_ICDF(24399),
+    AOM_ICDF(26819), AOM_ICDF(28539), AOM_ICDF(29762), AOM_ICDF(30631),
+    AOM_ICDF(31249), AOM_ICDF(31688), AOM_ICDF(32000), AOM_ICDF(32222),
+    AOM_ICDF(32380), AOM_ICDF(32492), AOM_ICDF(32572), AOM_ICDF(32768)},
+  { AOM_ICDF(9216), AOM_ICDF(15840), AOM_ICDF(20601), AOM_ICDF(24023),
+    AOM_ICDF(26483), AOM_ICDF(28251), AOM_ICDF(29522), AOM_ICDF(30435),
+    AOM_ICDF(31091), AOM_ICDF(31563), AOM_ICDF(31902), AOM_ICDF(32146),
+    AOM_ICDF(32321), AOM_ICDF(32447), AOM_ICDF(32537), AOM_ICDF(32768)},
+  { AOM_ICDF(8959), AOM_ICDF(15469), AOM_ICDF(20199), AOM_ICDF(23636),
+    AOM_ICDF(26133), AOM_ICDF(27947), AOM_ICDF(29265), AOM_ICDF(30223),
+    AOM_ICDF(30919), AOM_ICDF(31425), AOM_ICDF(31792), AOM_ICDF(32059),
+    AOM_ICDF(32253), AOM_ICDF(32394), AOM_ICDF(32496), AOM_ICDF(32768)},
+  { AOM_ICDF(8705), AOM_ICDF(15097), AOM_ICDF(19791), AOM_ICDF(23238),
+    AOM_ICDF(25770), AOM_ICDF(27629), AOM_ICDF(28994), AOM_ICDF(29997),
+    AOM_ICDF(30733), AOM_ICDF(31274), AOM_ICDF(31671), AOM_ICDF(31963),
+    AOM_ICDF(32177), AOM_ICDF(32334), AOM_ICDF(32449), AOM_ICDF(32768)},
+  { AOM_ICDF(8449), AOM_ICDF(14719), AOM_ICDF(19373), AOM_ICDF(22827),
+    AOM_ICDF(25390), AOM_ICDF(27292), AOM_ICDF(28704), AOM_ICDF(29752),
+    AOM_ICDF(30530), AOM_ICDF(31107), AOM_ICDF(31535), AOM_ICDF(31853),
+    AOM_ICDF(32089), AOM_ICDF(32264), AOM_ICDF(32394), AOM_ICDF(32768)},
+  { AOM_ICDF(8192), AOM_ICDF(14336), AOM_ICDF(18944), AOM_ICDF(22400),
+    AOM_ICDF(24992), AOM_ICDF(26936), AOM_ICDF(28394), AOM_ICDF(29488),
+    AOM_ICDF(30308), AOM_ICDF(30923), AOM_ICDF(31384), AOM_ICDF(31730),
+    AOM_ICDF(31989), AOM_ICDF(32184), AOM_ICDF(32330), AOM_ICDF(32768)},
+  { AOM_ICDF(7936), AOM_ICDF(13950), AOM_ICDF(18507), AOM_ICDF(21961),
+    AOM_ICDF(24578), AOM_ICDF(26561), AOM_ICDF(28064), AOM_ICDF(29203),
+    AOM_ICDF(30066), AOM_ICDF(30720), AOM_ICDF(31216), AOM_ICDF(31592),
+    AOM_ICDF(31877), AOM_ICDF(32093), AOM_ICDF(32256), AOM_ICDF(32768)},
+  { AOM_ICDF(7678), AOM_ICDF(13558), AOM_ICDF(18060), AOM_ICDF(21507),
+    AOM_ICDF(24146), AOM_ICDF(26166), AOM_ICDF(27713), AOM_ICDF(28897),
+    AOM_ICDF(29804), AOM_ICDF(30498), AOM_ICDF(31030), AOM_ICDF(31437),
+    AOM_ICDF(31749), AOM_ICDF(31988), AOM_ICDF(32171), AOM_ICDF(32768)},
+  { AOM_ICDF(7423), AOM_ICDF(13165), AOM_ICDF(17606), AOM_ICDF(21041),
+    AOM_ICDF(23698), AOM_ICDF(25753), AOM_ICDF(27342), AOM_ICDF(28571),
+    AOM_ICDF(29522), AOM_ICDF(30257), AOM_ICDF(30826), AOM_ICDF(31266),
+    AOM_ICDF(31606), AOM_ICDF(31869), AOM_ICDF(32073), AOM_ICDF(32768)},
+  { AOM_ICDF(7168), AOM_ICDF(12768), AOM_ICDF(17143), AOM_ICDF(20561),
+    AOM_ICDF(23231), AOM_ICDF(25317), AOM_ICDF(26947), AOM_ICDF(28220),
+    AOM_ICDF(29215), AOM_ICDF(29992), AOM_ICDF(30599), AOM_ICDF(31073),
+    AOM_ICDF(31444), AOM_ICDF(31734), AOM_ICDF(31960), AOM_ICDF(32768)},
+  { AOM_ICDF(6911), AOM_ICDF(12365), AOM_ICDF(16669), AOM_ICDF(20065),
+    AOM_ICDF(22744), AOM_ICDF(24858), AOM_ICDF(26526), AOM_ICDF(27842),
+    AOM_ICDF(28881), AOM_ICDF(29701), AOM_ICDF(30348), AOM_ICDF(30858),
+    AOM_ICDF(31261), AOM_ICDF(31579), AOM_ICDF(31830), AOM_ICDF(32768)},
+  { AOM_ICDF(6657), AOM_ICDF(11961), AOM_ICDF(16188), AOM_ICDF(19556),
+    AOM_ICDF(22240), AOM_ICDF(24379), AOM_ICDF(26083), AOM_ICDF(27441),
+    AOM_ICDF(28523), AOM_ICDF(29385), AOM_ICDF(30072), AOM_ICDF(30620),
+    AOM_ICDF(31056), AOM_ICDF(31404), AOM_ICDF(31681), AOM_ICDF(32768)},
+  { AOM_ICDF(6400), AOM_ICDF(11550), AOM_ICDF(15694), AOM_ICDF(19029),
+    AOM_ICDF(21712), AOM_ICDF(23871), AOM_ICDF(25609), AOM_ICDF(27007),
+    AOM_ICDF(28132), AOM_ICDF(29037), AOM_ICDF(29766), AOM_ICDF(30352),
+    AOM_ICDF(30824), AOM_ICDF(31204), AOM_ICDF(31509), AOM_ICDF(32768)},
+  { AOM_ICDF(6142), AOM_ICDF(11134), AOM_ICDF(15190), AOM_ICDF(18486),
+    AOM_ICDF(21164), AOM_ICDF(23340), AOM_ICDF(25108), AOM_ICDF(26544),
+    AOM_ICDF(27711), AOM_ICDF(28659), AOM_ICDF(29429), AOM_ICDF(30055),
+    AOM_ICDF(30564), AOM_ICDF(30977), AOM_ICDF(31313), AOM_ICDF(32768)},
+  { AOM_ICDF(5890), AOM_ICDF(10720), AOM_ICDF(14682), AOM_ICDF(17932),
+    AOM_ICDF(20598), AOM_ICDF(22785), AOM_ICDF(24579), AOM_ICDF(26051),
+    AOM_ICDF(27258), AOM_ICDF(28248), AOM_ICDF(29060), AOM_ICDF(29726),
+    AOM_ICDF(30273), AOM_ICDF(30721), AOM_ICDF(31089), AOM_ICDF(32768)},
+  { AOM_ICDF(5631), AOM_ICDF(10295), AOM_ICDF(14157), AOM_ICDF(17356),
+    AOM_ICDF(20005), AOM_ICDF(22199), AOM_ICDF(24016), AOM_ICDF(25520),
+    AOM_ICDF(26766), AOM_ICDF(27798), AOM_ICDF(28652), AOM_ICDF(29359),
+    AOM_ICDF(29945), AOM_ICDF(30430), AOM_ICDF(30832), AOM_ICDF(32768)},
+  { AOM_ICDF(5377), AOM_ICDF(9871), AOM_ICDF(13628), AOM_ICDF(16768),
+    AOM_ICDF(19393), AOM_ICDF(21587), AOM_ICDF(23421), AOM_ICDF(24954),
+    AOM_ICDF(26236), AOM_ICDF(27308), AOM_ICDF(28204), AOM_ICDF(28953),
+    AOM_ICDF(29579), AOM_ICDF(30102), AOM_ICDF(30539), AOM_ICDF(32768)},
+  { AOM_ICDF(5121), AOM_ICDF(9441), AOM_ICDF(13086), AOM_ICDF(16161),
+    AOM_ICDF(18756), AOM_ICDF(20945), AOM_ICDF(22792), AOM_ICDF(24351),
+    AOM_ICDF(25666), AOM_ICDF(26776), AOM_ICDF(27712), AOM_ICDF(28502),
+    AOM_ICDF(29169), AOM_ICDF(29731), AOM_ICDF(30206), AOM_ICDF(32768)},
+  { AOM_ICDF(4865), AOM_ICDF(9007), AOM_ICDF(12534), AOM_ICDF(15538),
+    AOM_ICDF(18096), AOM_ICDF(20274), AOM_ICDF(22129), AOM_ICDF(23708),
+    AOM_ICDF(25053), AOM_ICDF(26198), AOM_ICDF(27173), AOM_ICDF(28004),
+    AOM_ICDF(28711), AOM_ICDF(29313), AOM_ICDF(29826), AOM_ICDF(32768)},
+  { AOM_ICDF(4608), AOM_ICDF(8568), AOM_ICDF(11971), AOM_ICDF(14896),
+    AOM_ICDF(17409), AOM_ICDF(19569), AOM_ICDF(21425), AOM_ICDF(23020),
+    AOM_ICDF(24391), AOM_ICDF(25569), AOM_ICDF(26581), AOM_ICDF(27451),
+    AOM_ICDF(28199), AOM_ICDF(28842), AOM_ICDF(29394), AOM_ICDF(32768)},
+  { AOM_ICDF(4351), AOM_ICDF(8125), AOM_ICDF(11398), AOM_ICDF(14236),
+    AOM_ICDF(16697), AOM_ICDF(18831), AOM_ICDF(20682), AOM_ICDF(22287),
+    AOM_ICDF(23679), AOM_ICDF(24886), AOM_ICDF(25933), AOM_ICDF(26841),
+    AOM_ICDF(27628), AOM_ICDF(28311), AOM_ICDF(28903), AOM_ICDF(32768)},
+  { AOM_ICDF(4096), AOM_ICDF(7680), AOM_ICDF(10816), AOM_ICDF(13560),
+    AOM_ICDF(15961), AOM_ICDF(18062), AOM_ICDF(19900), AOM_ICDF(21508),
+    AOM_ICDF(22915), AOM_ICDF(24146), AOM_ICDF(25224), AOM_ICDF(26167),
+    AOM_ICDF(26992), AOM_ICDF(27714), AOM_ICDF(28346), AOM_ICDF(32768)},
+  { AOM_ICDF(3840), AOM_ICDF(7230), AOM_ICDF(10223), AOM_ICDF(12865),
+    AOM_ICDF(15197), AOM_ICDF(17256), AOM_ICDF(19074), AOM_ICDF(20679),
+    AOM_ICDF(22096), AOM_ICDF(23347), AOM_ICDF(24451), AOM_ICDF(25426),
+    AOM_ICDF(26287), AOM_ICDF(27047), AOM_ICDF(27718), AOM_ICDF(32768)},
+  { AOM_ICDF(3584), AOM_ICDF(6776), AOM_ICDF(9619), AOM_ICDF(12151),
+    AOM_ICDF(14406), AOM_ICDF(16414), AOM_ICDF(18203), AOM_ICDF(19796),
+    AOM_ICDF(21215), AOM_ICDF(22479), AOM_ICDF(23604), AOM_ICDF(24606),
+    AOM_ICDF(25499), AOM_ICDF(26294), AOM_ICDF(27002), AOM_ICDF(32768)},
+  { AOM_ICDF(3328), AOM_ICDF(6318), AOM_ICDF(9004), AOM_ICDF(11417),
+    AOM_ICDF(13585), AOM_ICDF(15533), AOM_ICDF(17283), AOM_ICDF(18856),
+    AOM_ICDF(20269), AOM_ICDF(21538), AOM_ICDF(22678), AOM_ICDF(23703),
+    AOM_ICDF(24624), AOM_ICDF(25451), AOM_ICDF(26194), AOM_ICDF(32768)},
+  { AOM_ICDF(3072), AOM_ICDF(5856), AOM_ICDF(8379), AOM_ICDF(10665),
+    AOM_ICDF(12737), AOM_ICDF(14615), AOM_ICDF(16317), AOM_ICDF(17859),
+    AOM_ICDF(19257), AOM_ICDF(20524), AOM_ICDF(21672), AOM_ICDF(22712),
+    AOM_ICDF(23655), AOM_ICDF(24509), AOM_ICDF(25283), AOM_ICDF(32768)},
+  { AOM_ICDF(2816), AOM_ICDF(5390), AOM_ICDF(7743), AOM_ICDF(9894),
+    AOM_ICDF(11860), AOM_ICDF(13657), AOM_ICDF(15299), AOM_ICDF(16800),
+    AOM_ICDF(18172), AOM_ICDF(19426), AOM_ICDF(20573), AOM_ICDF(21621),
+    AOM_ICDF(22579), AOM_ICDF(23455), AOM_ICDF(24255), AOM_ICDF(32768)},
+  { AOM_ICDF(2560), AOM_ICDF(4920), AOM_ICDF(7096), AOM_ICDF(9102),
+    AOM_ICDF(10951), AOM_ICDF(12656), AOM_ICDF(14227), AOM_ICDF(15676),
+    AOM_ICDF(17011), AOM_ICDF(18242), AOM_ICDF(19377), AOM_ICDF(20423),
+    AOM_ICDF(21388), AOM_ICDF(22277), AOM_ICDF(23097), AOM_ICDF(32768)},
+  { AOM_ICDF(2304), AOM_ICDF(4446), AOM_ICDF(6437), AOM_ICDF(8288),
+    AOM_ICDF(10009), AOM_ICDF(11609), AOM_ICDF(13097), AOM_ICDF(14480),
+    AOM_ICDF(15766), AOM_ICDF(16961), AOM_ICDF(18072), AOM_ICDF(19105),
+    AOM_ICDF(20066), AOM_ICDF(20959), AOM_ICDF(21789), AOM_ICDF(32768)},
+  { AOM_ICDF(2048), AOM_ICDF(3968), AOM_ICDF(5768), AOM_ICDF(7456),
+    AOM_ICDF(9038), AOM_ICDF(10521), AOM_ICDF(11911), AOM_ICDF(13215),
+    AOM_ICDF(14437), AOM_ICDF(15583), AOM_ICDF(16657), AOM_ICDF(17664),
+    AOM_ICDF(18608), AOM_ICDF(19493), AOM_ICDF(20323), AOM_ICDF(32768)},
+  { AOM_ICDF(1792), AOM_ICDF(3486), AOM_ICDF(5087), AOM_ICDF(6601),
+    AOM_ICDF(8032), AOM_ICDF(9385), AOM_ICDF(10664), AOM_ICDF(11873),
+    AOM_ICDF(13016), AOM_ICDF(14096), AOM_ICDF(15117), AOM_ICDF(16082),
+    AOM_ICDF(16995), AOM_ICDF(17858), AOM_ICDF(18673), AOM_ICDF(32768)},
+  { AOM_ICDF(1536), AOM_ICDF(3000), AOM_ICDF(4395), AOM_ICDF(5725),
+    AOM_ICDF(6993), AOM_ICDF(8201), AOM_ICDF(9353), AOM_ICDF(10451),
+    AOM_ICDF(11497), AOM_ICDF(12494), AOM_ICDF(13444), AOM_ICDF(14350),
+    AOM_ICDF(15213), AOM_ICDF(16036), AOM_ICDF(16820), AOM_ICDF(32768)},
+  { AOM_ICDF(1280), AOM_ICDF(2510), AOM_ICDF(3692), AOM_ICDF(4828),
+    AOM_ICDF(5919), AOM_ICDF(6968), AOM_ICDF(7976), AOM_ICDF(8944),
+    AOM_ICDF(9875), AOM_ICDF(10769), AOM_ICDF(11628), AOM_ICDF(12454),
+    AOM_ICDF(13248), AOM_ICDF(14011), AOM_ICDF(14744), AOM_ICDF(32768)},
+  { AOM_ICDF(1024), AOM_ICDF(2016), AOM_ICDF(2977), AOM_ICDF(3908),
+    AOM_ICDF(4810), AOM_ICDF(5684), AOM_ICDF(6530), AOM_ICDF(7350),
+    AOM_ICDF(8144), AOM_ICDF(8913), AOM_ICDF(9658), AOM_ICDF(10380),
+    AOM_ICDF(11080), AOM_ICDF(11758), AOM_ICDF(12415), AOM_ICDF(32768)},
+  {  AOM_ICDF(768), AOM_ICDF(1518), AOM_ICDF(2250), AOM_ICDF(2965),
+    AOM_ICDF(3663), AOM_ICDF(4345), AOM_ICDF(5011), AOM_ICDF(5662),
+    AOM_ICDF(6297), AOM_ICDF(6917), AOM_ICDF(7523), AOM_ICDF(8115),
+    AOM_ICDF(8693), AOM_ICDF(9257), AOM_ICDF(9808), AOM_ICDF(32768)},
+  {  AOM_ICDF(512), AOM_ICDF(1016), AOM_ICDF(1512), AOM_ICDF(2000),
+    AOM_ICDF(2481), AOM_ICDF(2954), AOM_ICDF(3420), AOM_ICDF(3879),
+    AOM_ICDF(4330), AOM_ICDF(4774), AOM_ICDF(5211), AOM_ICDF(5642),
+    AOM_ICDF(6066), AOM_ICDF(6483), AOM_ICDF(6894), AOM_ICDF(32768)},
+  {  AOM_ICDF(256),  AOM_ICDF(510),  AOM_ICDF(762), AOM_ICDF(1012),
+    AOM_ICDF(1260), AOM_ICDF(1506), AOM_ICDF(1750), AOM_ICDF(1992),
+    AOM_ICDF(2232), AOM_ICDF(2471), AOM_ICDF(2708), AOM_ICDF(2943),
+    AOM_ICDF(3176), AOM_ICDF(3407), AOM_ICDF(3636), AOM_ICDF(32768)},
 };
 
 
diff --git a/av1/decoder/generic_decoder.c b/av1/decoder/generic_decoder.c
index cafa365..0c7d71b 100644
--- a/av1/decoder/generic_decoder.c
+++ b/av1/decoder/generic_decoder.c
@@ -40,7 +40,7 @@
     int ft;
     ft = cdf[n - 1];
     for (i = 0; i < n; i++) {
-      cdf[i] = cdf[i]*32768/ft;
+      cdf[i] = AOM_ICDF(cdf[i]*32768/ft);
     }
   }
   val = aom_read_cdf(r, cdf, n, ACCT_STR_NAME);
diff --git a/av1/encoder/generic_encoder.c b/av1/encoder/generic_encoder.c
index 3c706eb..a31bb9e 100644
--- a/av1/encoder/generic_encoder.c
+++ b/av1/encoder/generic_encoder.c
@@ -42,7 +42,7 @@
     int ft;
     ft = cdf[n - 1];
     for (i = 0; i < n; i++) {
-      cdf[i] = cdf[i]*32768/ft;
+      cdf[i] = AOM_ICDF(cdf[i]*32768/ft);
     }
   }
   aom_write_cdf(w, val, cdf, n);