commit 4625cd522f2a586537d830d8875a4aa95cce7855
author Jingning Han <jingning@google.com> Mon Oct 07 16:30:07 2019 -0700
committer Jingning Han <jingning@google.com> Thu Oct 10 16:24:16 2019 +0000
tree dbce91115688c9602021e9e7a5a423ecad7b7fba
parent 07998db3a11997751dc352b195e843a414e1d8e6

Properly update the intra/inter selection in tpl model

Select and retain the best modes between inter and intra to build
tpl model.

STATS_CHANGED

Change-Id: I0166c72db5c6c04fe04926b27d8946ca88247c8f

av1/encoder/tpl_model.c

diff --git a/av1/encoder/tpl_model.c b/av1/encoder/tpl_model.c
index 5ddbb97..8e8cf45 100644
--- a/av1/encoder/tpl_model.c
+++ b/av1/encoder/tpl_model.c
@@ -281,13 +281,14 @@
       uint16_t eob;
       best_rf_idx = rf_idx;
       best_inter_cost_weighted = inter_cost_weighted;
-      best_mode = NEWMV;
       best_mv.as_int = x->best_mv.as_int;
       get_quantize_error(x, 0, coeff, qcoeff, dqcoeff, tx_size, &eob,
                          recon_error, sse);
       int rate_cost = rate_estimator(qcoeff, eob, tx_size);
       best_rdcost = RDCOST(base_rdmult, rate_cost, *recon_error);
       tpl_stats->srcrf_rate = rate_cost << TPL_DEP_COST_SCALE_LOG2;
+
+      if (best_inter_cost_weighted < best_intra_cost) best_mode = NEWMV;
     }
   }
   best_intra_cost = AOMMAX(best_intra_cost, 1);