commit 02101d1a10fa2ccd8cfc03afd2868f5f69ed05e9
author Wei-Ting Lin <weitinglin@google.com> Fri Aug 04 10:06:38 2017 -0700
committer Wei-ting Lin <weitinglin@google.com> Tue Sep 05 22:17:52 2017 +0000
tree 5529d305eb0e97ffaaa22e9220c86ed1f75f53ee
parent 01d4d8f25c88806c1860d1178490c462cf8b2f6a

ncobmc-adapt-weight: add ncobmc-mode into entropy_optimizer

Change-Id: I8c8c13d46fc20453794e28a6dbcb478180ad71d0

tools/aom_entropy_optimizer.c

diff --git a/tools/aom_entropy_optimizer.c b/tools/aom_entropy_optimizer.c
index 04ba409..8154085 100644
--- a/tools/aom_entropy_optimizer.c
+++ b/tools/aom_entropy_optimizer.c
@@ -545,6 +545,19 @@
                      "static const aom_cdf_prob "
                      "default_obmc_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)]");
 #endif  // CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
+#if CONFIG_NCOBMC_ADAPT_WEIGHT
+  cts_each_dim[0] = ADAPT_OVERLAP_BLOCKS;
+  cts_each_dim[1] = MAX_NCOBMC_MODES;
+  optimize_entropy_table(
+      &fc.ncobmc_mode[0][0], probsfile, 2, cts_each_dim, av1_ncobmc_mode_tree,
+      0,
+      "static const aom_prob default_ncobmc_mode_prob[ADAPT_OVERLAP_BLOCKS]"
+      "[MAX_NCOBMC_MODES - 1]");
+  optimize_cdf_table(&fc.ncobmc_mode[0][0], probsfile, 2, cts_each_dim,
+                     "static const aom_cdf_prob\n"
+                     "default_ncobmc_mode_cdf[ADAPT_OVERLAP_BLOCKS]"
+                     "[CDF_SIZE(MAX_NCOBMC_MODES)]");
+#endif
 #endif  // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
 
   /* Intra/inter flag */