commit 53b53f0aa1aa835364464a7940a59076f1c0f936
author Yue Chen <yuec@google.com> Thu Mar 29 14:31:23 2018 -0700
committer Yue Chen <yuec@google.com> Sat Mar 31 02:50:39 2018 +0000
tree 4232476d7a18bb1381730daf7b659f548bec37af
parent b07e6269a1556a969dfbdf9423e2f8caf272b3ad

Merge MB_MODE_INFO and MODE_INFO

Cb4x4 has taken out bmi structure from mode_info. Now mode_info
and mb_mode_info are effectively the same thing.
Therefore in this patch, MODE_INFO is removed and the code is
refactored.

BUG=aomedia:1669

Change-Id: Ic246dc0004835e5a99e44104e888fe2f2e61cf21

av1/common/debugmodes.c

diff --git a/av1/common/debugmodes.c b/av1/common/debugmodes.c
index 7fa2271..868f341 100644
--- a/av1/common/debugmodes.c
+++ b/av1/common/debugmodes.c
@@ -27,7 +27,7 @@
 static void print_mi_data(AV1_COMMON *cm, FILE *file, const char *descriptor,
                           size_t member_offset) {
   int mi_row, mi_col;
-  MODE_INFO **mi = cm->mi_grid_visible;
+  MB_MODE_INFO **mi = cm->mi_grid_visible;
   int rows = cm->mi_rows;
   int cols = cm->mi_cols;
   char prefix = descriptor[0];
@@ -36,8 +36,7 @@
   for (mi_row = 0; mi_row < rows; mi_row++) {
     fprintf(file, "%c ", prefix);
     for (mi_col = 0; mi_col < cols; mi_col++) {
-      fprintf(file, "%2d ",
-              *((char *)((char *)(&mi[0]->mbmi) + member_offset)));
+      fprintf(file, "%2d ", *((char *)((char *)(mi[0]) + member_offset)));
       mi++;
     }
     fprintf(file, "\n");
@@ -50,7 +49,7 @@
   int mi_row;
   int mi_col;
   FILE *mvs = fopen(file, "a");
-  MODE_INFO **mi = cm->mi_grid_visible;
+  MB_MODE_INFO **mi = cm->mi_grid_visible;
   int rows = cm->mi_rows;
   int cols = cm->mi_cols;
 
@@ -65,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[0]->mbmi.skip);
+      fprintf(mvs, "%2d ", mi[0]->skip);
       mi++;
     }
     fprintf(mvs, "\n");
@@ -79,8 +78,7 @@
   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[0]->mbmi.mv[0].as_mv.row,
-              mi[0]->mbmi.mv[0].as_mv.col);
+      fprintf(mvs, "%4d:%4d ", mi[0]->mv[0].as_mv.row, mi[0]->mv[0].as_mv.col);
       mi++;
     }
     fprintf(mvs, "\n");