shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix debugmodes file to print modes and MVs correctly"

--- a/vp9/common/vp9_debugmodes.c

+++ b/vp9/common/vp9_debugmodes.c

@@ -25,7 +25,7 @@

 static void print_mi_data(VP9_COMMON *cm, FILE *file, const char *descriptor,

                           size_t member_offset) {

   int mi_row, mi_col;

-  MODE_INFO *mi = cm->mi;

+  MODE_INFO **mi = cm->mi_grid_visible;

   int rows = cm->mi_rows;

   int cols = cm->mi_cols;

   char prefix = descriptor[0];

@@ -35,7 +35,7 @@

     fprintf(file, "%c ", prefix);

     for (mi_col = 0; mi_col < cols; mi_col++) {

       fprintf(file, "%2d ",

-              *((int*) ((char *) (&mi->mbmi) +

+              *((int*) ((char *) (&mi[0]->mbmi) +

                                   member_offset)));

       mi++;

     }

@@ -49,7 +49,7 @@

   int mi_row;

   int mi_col;

   FILE *mvs = fopen(file, "a");

-  MODE_INFO *mi = cm->mi;

+  MODE_INFO **mi = cm->mi_grid_visible;

   int rows = cm->mi_rows;

   int cols = cm->mi_cols;

@@ -64,7 +64,7 @@

   for (mi_row = 0; mi_row < rows; mi_row++) {

     fprintf(mvs, "S ");

     for (mi_col = 0; mi_col < cols; mi_col++) {

-      fprintf(mvs, "%2d ", mi->mbmi.skip);

+      fprintf(mvs, "%2d ", mi[0]->mbmi.skip);

       mi++;

     }

     fprintf(mvs, "\n");

@@ -74,12 +74,12 @@

   // output motion vectors.

   log_frame_info(cm, "Vectors ", mvs);

-  mi = cm->mi;

+  mi = cm->mi_grid_visible;

   for (mi_row = 0; mi_row < rows; mi_row++) {

     fprintf(mvs, "V ");

     for (mi_col = 0; mi_col < cols; mi_col++) {

-      fprintf(mvs, "%4d:%4d ", mi->mbmi.mv[0].as_mv.row,

-                               mi->mbmi.mv[0].as_mv.col);

+      fprintf(mvs, "%4d:%4d ", mi[0]->mbmi.mv[0].as_mv.row,

+                               mi[0]->mbmi.mv[0].as_mv.col);

       mi++;

     }

     fprintf(mvs, "\n");