shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removing print_prob_tree function and vp9_coeff_probs typedef."

--- a/vp9/common/vp9_entropy.h

+++ b/vp9/common/vp9_entropy.h

@@ -96,8 +96,6 @@

                                     [MAX_ENTROPY_TOKENS];

 typedef unsigned int vp9_coeff_stats[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS]

                                     [ENTROPY_NODES][2];

-typedef vp9_prob vp9_coeff_probs[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS]

-                                [ENTROPY_NODES];

 #define SUBEXP_PARAM                4   /* Subexponential code parameter */

 #define MODULUS_PARAM               13  /* Modulus parameter */

--- a/vp9/encoder/vp9_bitstream.c

+++ b/vp9/encoder/vp9_bitstream.c

@@ -696,35 +696,6 @@

   }

 }

-/* This function is used for debugging probability trees. */

-static void print_prob_tree(vp9_coeff_probs *coef_probs, int block_types) {

-  /* print coef probability tree */

-  int i, j, k, l, m;

-  FILE *f = fopen("enc_tree_probs.txt", "a");

-  fprintf(f, "{\n");

-  for (i = 0; i < block_types; i++) {

-    fprintf(f, "  {\n");

-    for (j = 0; j < REF_TYPES; ++j) {

-      fprintf(f, "  {\n");

-      for (k = 0; k < COEF_BANDS; k++) {

-        fprintf(f, "    {\n");

-        for (l = 0; l < PREV_COEF_CONTEXTS; l++) {

-          fprintf(f, "      {");

-          for (m = 0; m < ENTROPY_NODES; m++) {

-            fprintf(f, "%3u, ",

-                    (unsigned int)(coef_probs[i][j][k][l][m]));

-          }

-        }

-        fprintf(f, " }\n");

-      }

-      fprintf(f, "    }\n");

-    }

-    fprintf(f, "  }\n");

-  }

-  fprintf(f, "}\n");

-  fclose(f);

-}

-

 static void build_tree_distribution(VP9_COMP *cpi, TX_SIZE tx_size) {

   vp9_coeff_probs_model *coef_probs = cpi->frame_coef_probs[tx_size];

   vp9_coeff_count *coef_counts = cpi->coef_counts[tx_size];