commit 9dc909ddd8b9777fae94d0e6742dc6c16e3864b7
author Urvang Joshi <urvang@google.com> Mon Mar 23 16:07:02 2020 -0700
committer Urvang Joshi <urvang@google.com> Thu Mar 26 00:17:38 2020 +0000
tree e9d1421ac4ca132de5adcd30b4ee383230aefb3b
parent fbc2b86dc6116abfe24c83f03331832cb0ac3281

Refactor CommonModeInfoParams from AV1_COMMON

Also, refactor local variables/args for mi_params when we can.

BUG=aomedia:2610

Change-Id: Ifb53494d0e1dd476c2b4a473817ebc583e94a371

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 0b539b0..c2941a5 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -73,8 +73,8 @@
 
 void av1_alloc_txb_buf(AV1_COMP *cpi) {
   AV1_COMMON *cm = &cpi->common;
-  int size = ((cm->mi_rows >> cm->seq_params.mib_size_log2) + 1) *
-             ((cm->mi_cols >> cm->seq_params.mib_size_log2) + 1);
+  int size = ((cm->mi_params.mi_rows >> cm->seq_params.mib_size_log2) + 1) *
+             ((cm->mi_params.mi_cols >> cm->seq_params.mib_size_log2) + 1);
 
   av1_free_txb_buf(cpi);
   // TODO(jingning): This should be further reduced.
@@ -2259,7 +2259,7 @@
                                          int mi_col) {
   const AV1_COMMON *const cm = &cpi->common;
   const int mib_size_log2 = cm->seq_params.mib_size_log2;
-  const int stride = (cm->mi_cols >> mib_size_log2) + 1;
+  const int stride = (cm->mi_params.mi_cols >> mib_size_log2) + 1;
   const int offset =
       (mi_row >> mib_size_log2) * stride + (mi_col >> mib_size_log2);
   return cpi->coeff_buffer_base + offset;