commit 1f9343a38f300208bcc3a5a1d9a5d75848f8be6d
author Yue Chen <yuec@google.com> Wed Oct 11 16:03:08 2017 -0700
committer Yue Chen <yuec@google.com> Thu Oct 12 16:53:58 2017 +0000
tree fdcedfb1879a0cf2da62bb92bd33464ea40ce147
parent d92f3560389dc25a3b2210bb1184f39e1ce4c786

entropy_stats: modify output for intra coder

Align the output of prob optimizer with what is needed by intra
coder.

Change-Id: Icdecb33240a5691c8c292946faa00d0bfebee742

tools/aom_entropy_optimizer.c

diff --git a/tools/aom_entropy_optimizer.c b/tools/aom_entropy_optimizer.c
index ae8816c..ff1e88e 100644
--- a/tools/aom_entropy_optimizer.c
+++ b/tools/aom_entropy_optimizer.c
@@ -333,23 +333,14 @@
   cts_each_dim[0] = INTRA_MODES;
   cts_each_dim[1] = INTRA_MODES;
   cts_each_dim[2] = INTRA_MODES;
-  optimize_entropy_table(
-      &fc.kf_y_mode[0][0][0], probsfile, 3, cts_each_dim, av1_intra_mode_tree,
-      0,
-      "const aom_prob av1_kf_y_mode_prob[INTRA_MODES][INTRA_MODES]"
-      "[INTRA_MODES - 1]");
   optimize_cdf_table(
       &fc.kf_y_mode[0][0][0], probsfile, 3, cts_each_dim,
       "const aom_cdf_prob\n"
-      "av1_kf_y_mode_cdf[INTRA_MODES][INTRA_MODES][CDF_SIZE(INTRA_MODES)]");
+      "default_kf_y_mode_cdf[INTRA_MODES][INTRA_MODES][CDF_SIZE(INTRA_MODES)]");
 
   /* Intra mode (non-keyframe luma) */
   cts_each_dim[0] = BLOCK_SIZE_GROUPS;
   cts_each_dim[1] = INTRA_MODES;
-  optimize_entropy_table(
-      &fc.y_mode[0][0], probsfile, 2, cts_each_dim, av1_intra_mode_tree, 0,
-      "static const aom_prob default_if_y_probs[BLOCK_SIZE_GROUPS]"
-      "[INTRA_MODES - 1]");
   optimize_cdf_table(
       &fc.y_mode[0][0], probsfile, 2, cts_each_dim,
       "static const aom_cdf_prob\n"
@@ -358,10 +349,6 @@
   /* Intra mode (chroma) */
   cts_each_dim[0] = INTRA_MODES;
   cts_each_dim[1] = UV_INTRA_MODES;
-  optimize_entropy_table(&fc.uv_mode[0][0], probsfile, 2, cts_each_dim,
-                         av1_intra_mode_tree, 0,
-                         "static const aom_prob default_uv_probs[INTRA_MODES]"
-                         "[UV_INTRA_MODES - 1]");
   optimize_cdf_table(
       &fc.uv_mode[0][0], probsfile, 2, cts_each_dim,
       "static const aom_cdf_prob\n"