commit 27619e3e0db6d30b33c1ad2bf4c476bd9b7ba210
author Jingning Han <jingning@google.com> Sun Dec 27 13:24:35 2020 -0800
committer Jingning Han <jingning@google.com> Mon Jan 11 19:35:29 2021 +0000
tree 5e6547de9b7d5f24e59a65726054b933d013b23c
parent 8f6611fb1e871d62c711789e6330895938605f61

Rework tpl model layout

Change-Id: I5f00628bdda9477bb8a0ea1c50f0dcb80c9b2ba0

av1/encoder/tpl_model.c

diff --git a/av1/encoder/tpl_model.c b/av1/encoder/tpl_model.c
index 1aa308a..af7b95c 100644
--- a/av1/encoder/tpl_model.c
+++ b/av1/encoder/tpl_model.c
@@ -328,6 +328,7 @@
 
   // Motion compensated prediction
   xd->mi[0]->ref_frame[0] = INTRA_FRAME;
+  xd->mi[0]->ref_frame[1] = NONE_FRAME;
 
   int best_rf_idx = -1;
   int_mv best_mv;
@@ -478,7 +479,12 @@
   tpl_stats->srcrf_dist = recon_error << (TPL_DEP_COST_SCALE_LOG2);
 
   // Final encode
-  if (is_inter_mode(best_mode)) {
+  if (!is_inter_mode(best_mode)) {
+    av1_predict_intra_block(cm, xd, block_size_wide[bsize],
+                            block_size_high[bsize], tx_size, best_mode, 0, 0,
+                            FILTER_INTRA_MODES, dst_buffer, dst_buffer_stride,
+                            dst_buffer, dst_buffer_stride, 0, 0, 0);
+  } else {
     const YV12_BUFFER_CONFIG *ref_frame_ptr = tpl_data->ref_frame[best_rf_idx];
 
     InterPredParams inter_pred_params;
@@ -492,11 +498,6 @@
 
     av1_enc_build_one_inter_predictor(dst_buffer, dst_buffer_stride,
                                       &best_mv.as_mv, &inter_pred_params);
-  } else {
-    av1_predict_intra_block(cm, xd, block_size_wide[bsize],
-                            block_size_high[bsize], tx_size, best_mode, 0, 0,
-                            FILTER_INTRA_MODES, dst_buffer, dst_buffer_stride,
-                            dst_buffer, dst_buffer_stride, 0, 0, 0);
   }
 
   int rate_cost;