shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove print_nmvcounts"

--- a/vp9/encoder/vp9_encodemv.c

+++ b/vp9/encoder/vp9_encodemv.c

@@ -257,55 +257,6 @@

   }

 }

-

-void print_nmvcounts(nmv_context_counts tnmvcounts) {

-  int i, j, k;

-  printf("\nCounts =\n  { ");

-  for (j = 0; j < MV_JOINTS; ++j)

-    printf("%d, ", tnmvcounts.joints[j]);

-  printf("},\n");

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

-    printf("  {\n");

-    printf("    %d/%d,\n", tnmvcounts.comps[i].sign[0],

-                           tnmvcounts.comps[i].sign[1]);

-    printf("    { ");

-    for (j = 0; j < MV_CLASSES; ++j)

-      printf("%d, ", tnmvcounts.comps[i].classes[j]);

-    printf("},\n");

-    printf("    { ");

-    for (j = 0; j < CLASS0_SIZE; ++j)

-      printf("%d, ", tnmvcounts.comps[i].class0[j]);

-    printf("},\n");

-    printf("    { ");

-    for (j = 0; j < MV_OFFSET_BITS; ++j)

-      printf("%d/%d, ", tnmvcounts.comps[i].bits[j][0],

-                        tnmvcounts.comps[i].bits[j][1]);

-    printf("},\n");

-

-    printf("    {");

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

-      printf("{");

-      for (k = 0; k < 4; ++k)

-        printf("%d, ", tnmvcounts.comps[i].class0_fp[j][k]);

-      printf("}, ");

-    }

-    printf("},\n");

-

-    printf("    { ");

-    for (j = 0; j < 4; ++j)

-      printf("%d, ", tnmvcounts.comps[i].fp[j]);

-    printf("},\n");

-

-    printf("    %d/%d,\n",

-           tnmvcounts.comps[i].class0_hp[0],

-           tnmvcounts.comps[i].class0_hp[1]);

-    printf("    %d/%d,\n",

-           tnmvcounts.comps[i].hp[0],

-           tnmvcounts.comps[i].hp[1]);

-    printf("  },\n");

-  }

-}

-

 #ifdef NMV_STATS

 void init_nmvstats() {

   vp9_zero(tnmvcounts);

--- a/vp9/encoder/vp9_encodemv.h

+++ b/vp9/encoder/vp9_encodemv.h

@@ -28,6 +28,4 @@

 void vp9_update_nmv_count(VP9_COMP *cpi, MACROBLOCK *x,

                           int_mv *best_ref_mv, int_mv *second_best_ref_mv);

-void print_nmvcounts(nmv_context_counts tnmvcounts);

-

 #endif  // VP9_ENCODER_VP9_ENCODEMV_H_

-- 

⑨