commit e09a9a6c86a3d56216d6ed1e11657ba750d32716
author Thomas Daede <tdaede@mozilla.com> Mon Nov 06 20:16:27 2017 -0800
committer Thomas Daede <tdaede@mozilla.com> Wed Nov 08 22:12:11 2017 +0000
tree 7c709202449e444a7ca4211d44dd6bb63391bb8c
parent e82e5774ead83525b95beab9db6ea6bf1fff023b

Update entropy optimizer for new AOM_CDF* macros.

Change-Id: If0b45997af5c0b209b48db9bd78ed6be204acb7c

tools/aom_entropy_optimizer.c

diff --git a/tools/aom_entropy_optimizer.c b/tools/aom_entropy_optimizer.c
index 290bd59..5777996 100644
--- a/tools/aom_entropy_optimizer.c
+++ b/tools/aom_entropy_optimizer.c
@@ -251,9 +251,12 @@
     (*ct_ptr) += total_modes;
 
     if (tabs > 0) fprintf(probsfile, "%*c", tabs * SPACES_PER_TAB, ' ');
-    for (int k = 0; k < total_modes; ++k)
-      fprintf(probsfile, " AOM_ICDF(%d),", cdfs[k]);
-    fprintf(probsfile, " 0 ");
+    fprintf(probsfile, "AOM_CDF%d( ", total_modes);
+    for (int k = 0; k < total_modes - 1; ++k) {
+      fprintf(probsfile, "%d", cdfs[k]);
+      if (k < total_modes - 2) fprintf(probsfile, ",");
+    }
+    fprintf(probsfile, " )");
   } else {
     for (int k = 0; k < cts_each_dim[0]; ++k) {
       int tabs_next_level;