commit 6a60280edf3a590ec390e0a8cd80a47fabc1e0bd
author Yunqing Wang <yunqingwang@google.com> Mon Aug 26 14:13:11 2019 -0700
committer Yunqing Wang <yunqingwang@google.com> Tue Aug 27 15:37:32 2019 +0000
tree 1ecb2f2fb9d2fe2ec1ae32c7e3cea9f70d5707d4
parent d25ac3b3c4d1065f803cdcd48585abf0cd3a2f44

Make tpl_rdmult_setup work for superres

Made tpl_rdmult_setup function work for superres mode.

Change-Id: Ib214d087b94f023c82ef367c36081a499cb7e694

av1/encoder/tpl_model.c

diff --git a/av1/encoder/tpl_model.c b/av1/encoder/tpl_model.c
index affce91..3d06640 100644
--- a/av1/encoder/tpl_model.c
+++ b/av1/encoder/tpl_model.c
@@ -1058,14 +1058,15 @@
 
   const TplDepFrame *const tpl_frame = &cpi->tpl_frame[tpl_idx];
   if (!tpl_frame->is_valid) return;
-  if (cpi->oxcf.superres_mode != SUPERRES_NONE) return;
+
   const TplDepStats *const tpl_stats = tpl_frame->tpl_stats_ptr;
   const int tpl_stride = tpl_frame->stride;
+  const int mi_cols_sr = av1_pixels_to_mi(cm->superres_upscaled_width);
 
   const int block_size = BLOCK_16X16;
   const int num_mi_w = mi_size_wide[block_size];
   const int num_mi_h = mi_size_high[block_size];
-  const int num_cols = (cm->mi_cols + num_mi_w - 1) / num_mi_w;
+  const int num_cols = (mi_cols_sr + num_mi_w - 1) / num_mi_w;
   const int num_rows = (cm->mi_rows + num_mi_h - 1) / num_mi_h;
   const double c = 1.2;
   const int step = 1 << cpi->tpl_stats_block_mis_log2;
@@ -1081,7 +1082,7 @@
            mi_row += step) {
         for (int mi_col = col * num_mi_w; mi_col < (col + 1) * num_mi_w;
              mi_col += step) {
-          if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols) continue;
+          if (mi_row >= cm->mi_rows || mi_col >= mi_cols_sr) continue;
           const TplDepStats *this_stats =
               &tpl_stats[av1_tpl_ptr_pos(cpi, mi_row, mi_col, tpl_stride)];
           intra_cost += (double)this_stats->intra_cost;