commit 01b46cc6456bcf1b39093462b8ea4db7fb19c7f0
author Jerome Jiang <jianj@google.com> Thu Mar 11 10:46:15 2021 -0800
committer Jerome Jiang <jianj@google.com> Fri Mar 12 13:34:44 2021 -0800
tree 0c405183df235ef1b2df9f2fd0c9c579a2283e68
parent fb9f22ce8c54e277e5162d8643a1a254dcc5173a

Exclude TPL based pickmode pruning for RT build.

Bug: webrtc:12576
Change-Id: I8084da18ea00db059497075bd6d02f0d79172ec0
(cherry picked from commit f4064dd1c74659bbaf020da6512d9987c0340065)

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 9f36f89..49f52c7 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -5333,10 +5333,11 @@
     get_block_level_tpl_stats(cpi, bsize, mi_row, mi_col, valid_refs,
                               &inter_cost_info_from_tpl);
   }
-#endif
+
   const int do_pruning =
       (AOMMIN(cm->width, cm->height) > 480 && cpi->speed <= 1) ? 0 : 1;
-  if (do_pruning && sf->intra_sf.skip_intra_in_interframe) {
+  if (do_pruning && sf->intra_sf.skip_intra_in_interframe &&
+      cpi->oxcf.algo_cfg.enable_tpl_model) {
     // Only consider full SB.
     const BLOCK_SIZE sb_size = cm->seq_params.sb_size;
     const int tpl_bsize_1d = cpi->tpl_data.tpl_bsize_1d;
@@ -5366,6 +5367,7 @@
       }
     }
   }
+#endif  // !CONFIG_REALTIME_ONLY
 
   // Initialize best mode stats for winner mode processing
   av1_zero(x->winner_mode_stats);