commit d131791344c2ee078d8f12b99430211a69a02a86
author Vishesh <vishesh.garg@ittiam.com> Tue Apr 07 14:39:44 2020 +0530
committer Yunqing Wang <yunqingwang@google.com> Wed Apr 08 20:16:40 2020 +0000
tree 3b6ae7bae8812302714ab330c07c0409202182c9
parent ad0518d94efadcdefdf3092e1159f792fc951714

Modularize a buffer related info in AV1_COMP

This CL groups MB_MODE_INFO_EXT_FRAME and related
variables from AV1_COMP into a new struct ModeInfoExtFrame,
adds documentation, and cleans up function interfaces.

BUG=aomedia:2610

Change-Id: I5ca6268e28012ee5741d6cec555815f7004ebad6

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 805a112..aafa9fd 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1311,12 +1311,15 @@
 #endif
 
 #if ENC_MISMATCH_DEBUG
-static AOM_INLINE void enc_dump_logs(AV1_COMP *cpi, int mi_row, int mi_col) {
-  AV1_COMMON *const cm = &cpi->common;
+static AOM_INLINE void enc_dump_logs(
+    const AV1_COMMON *const cm,
+    const MBMIExtFrameBufferInfo *const mbmi_ext_info, int mi_row, int mi_col) {
   const MB_MODE_INFO *const mbmi = *(
       cm->mi_params.mi_grid_base + (mi_row * cm->mi_params.mi_stride + mi_col));
-  const MB_MODE_INFO_EXT_FRAME *const mbmi_ext_frame_base =
-      cpi->mbmi_ext_frame_base + get_mi_ext_idx(&cm->mi_params, mi_row, mi_col);
+  const MB_MODE_INFO_EXT_FRAME *const mbmi_ext_frame =
+      mbmi_ext_info->frame_base + get_mi_ext_idx(mi_row, mi_col,
+                                                 cm->mi_params.mi_alloc_bsize,
+                                                 mbmi_ext_info->stride);
   if (is_inter_block(mbmi)) {
 #define FRAME_TO_CHECK 11
     if (cm->current_frame.frame_number == FRAME_TO_CHECK &&
@@ -1378,7 +1381,7 @@
     set_ref_ptrs(cm, xd, m->ref_frame[0], m->ref_frame[1]);
 
 #if ENC_MISMATCH_DEBUG
-    enc_dump_logs(cpi, xd->mi_row, xd->mi_col);
+    enc_dump_logs(cm, &cpi->mbmi_ext_info, xd->mi_row, xd->mi_col);
 #endif  // ENC_MISMATCH_DEBUG
 
     pack_inter_mode_mvs(cpi, w);
@@ -1485,7 +1488,9 @@
   const int grid_idx = mi_row * mi_params->mi_stride + mi_col;
   xd->mi = mi_params->mi_grid_base + grid_idx;
   cpi->td.mb.mbmi_ext_frame =
-      cpi->mbmi_ext_frame_base + get_mi_ext_idx(cpi, mi_row, mi_col);
+      cpi->mbmi_ext_info.frame_base +
+      get_mi_ext_idx(mi_row, mi_col, cm->mi_params.mi_alloc_bsize,
+                     cpi->mbmi_ext_info.stride);
   xd->tx_type_map = mi_params->tx_type_map + grid_idx;
   xd->tx_type_map_stride = mi_params->mi_stride;