commit 2d0919f2af09ff0f27c349082a241cf8d1b1fff7
author elliottk <elliottk@google.com> Thu May 09 21:04:58 2019 -0700
committer Elliott Karpilovsky <elliottk@google.com> Fri May 10 21:28:23 2019 +0000
tree 97b822096bf2a782148eb4c21e817eae9205b1e6
parent c1cce3ca9b9e8e6577371ad3585f6730881b86e5

Disable prune-simple-translation for resized frames

BUG=aomedia:2383
BUG=aomedia:2384

STATS_CHANGED

Change-Id: I247d53b0ea4ef532c30219ab4a9d43629972b551

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index ceb88de..897daef 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -10120,6 +10120,7 @@
                                 int64_t ref_best_rd, inter_mode_info *mode_info,
                                 BLOCK_SIZE bsize, int mi_row, int mi_col,
                                 const int ref_set) {
+  AV1_COMMON *const cm = &cpi->common;
   const MACROBLOCKD *const xd = &x->e_mbd;
   const MB_MODE_INFO *const mbmi = xd->mi[0];
   const PREDICTION_MODE this_mode = mbmi->mode;
@@ -10139,6 +10140,13 @@
   if (!cpi->sf.prune_mode_search_simple_translation) return good_indices;
   if (!have_nearmv_in_inter_mode(this_mode)) return good_indices;
   if (num_pels_log2_lookup[bsize] <= 6) return good_indices;
+  // Do not prune when there is internal resizing. TODO(elliottk) fix this
+  // so b/2384 can be resolved.
+  if (av1_is_scaled(get_ref_scale_factors(cm, mbmi->ref_frame[0])) ||
+      (mbmi->ref_frame[1] > 0 &&
+       av1_is_scaled(get_ref_scale_factors(cm, mbmi->ref_frame[1])))) {
+    return good_indices;
+  }
 
   // Calculate the RD cost for the motion vectors using simple translation.
   int64_t idx_rdcost[] = { INT64_MAX, INT64_MAX, INT64_MAX };