commit 53a2d8a7ff64dfdf5102aab03e949a21bcc7061a
author Hui Su <huisu@google.com> Mon Mar 16 12:06:07 2020 -0700
committer Hui Su <huisu@google.com> Wed Mar 18 17:07:49 2020 +0000
tree e506b5cb783b31403ca0d13b1c89829034f98509
parent 0ec9bb69ce244a134cfed481aac6119cd4fb22b3

small optimization in av1_handle_inter_intra_mode()

When refining new motion vector for interintra modes, there is no need
to re-calculate the intra predictor.

Change-Id: Ifa5d13cc764e848509eca4bac0b5b2a7e5768847

av1/encoder/compound_type.c

diff --git a/av1/encoder/compound_type.c b/av1/encoder/compound_type.c
index fd0f61c..1469a10 100644
--- a/av1/encoder/compound_type.c
+++ b/av1/encoder/compound_type.c
@@ -714,8 +714,15 @@
                                         mask, bw, &tmp_rate_mv, 0);
       if (mbmi->mv[0].as_int != tmp_mv.as_int) {
         mbmi->mv[0].as_int = tmp_mv.as_int;
+        // Set ref_frame[1] to NONE_FRAME temporarily so that the intra
+        // predictor is not calculated again in av1_enc_build_inter_predictor().
+        mbmi->ref_frame[1] = NONE_FRAME;
         av1_enc_build_inter_predictor(cm, xd, mi_row, mi_col, orig_dst, bsize,
                                       AOM_PLANE_Y, AOM_PLANE_Y);
+        mbmi->ref_frame[1] = INTRA_FRAME;
+        av1_combine_interintra(xd, bsize, 0, xd->plane[AOM_PLANE_Y].dst.buf,
+                               xd->plane[AOM_PLANE_Y].dst.stride, intrapred,
+                               bw);
         model_rd_sb_fn[MODELRD_TYPE_MASKED_COMPOUND](
             cpi, bsize, x, xd, 0, 0, &rate_sum, &dist_sum, &skip_txfm_sb,
             &skip_sse_sb, NULL, NULL, NULL);