commit c3ef32a495aa845b3d12863380a29f2c37c1d8ca
author Jingning Han <jingning@google.com> Mon Dec 04 09:56:53 2017 -0800
committer Jingning Han <jingning@google.com> Tue Dec 05 15:55:44 2017 +0000
tree ad61800d2b16f141265ef5054ba0de77b311242f
parent b56b71aed2fd235c8a96bd0f838531940a145b5c

Simplify ref_mvs assignment

Drop unnecessary ref_mvs assignment steps in the rate-distortion
optimization process.

Change-Id: Icbd0436d2f962ec6b1141b889cf5892b863f081d

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index a5677c7..d7e722e 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -10090,7 +10090,6 @@
         {
           int64_t tmp_alt_rd = INT64_MAX;
           int dummy_disable_skip = 0;
-          int ref;
           int_mv cur_mv;
           RD_STATS tmp_rd_stats, tmp_rd_stats_y, tmp_rd_stats_uv;
 #if CONFIG_JNT_COMP
@@ -10141,17 +10140,12 @@
               mbmi_ext->ref_mvs[mbmi->ref_frame[1]][0] = this_mv;
             }
           } else {
-            for (ref = 0; ref < 1 + comp_pred; ++ref) {
-              int_mv this_mv =
-                  (ref == 0)
-                      ? mbmi_ext->ref_mv_stack[ref_frame_type][mbmi->ref_mv_idx]
-                            .this_mv
-                      : mbmi_ext->ref_mv_stack[ref_frame_type][mbmi->ref_mv_idx]
-                            .comp_mv;
-              clamp_mv_ref(&this_mv.as_mv, xd->n8_w << MI_SIZE_LOG2,
-                           xd->n8_h << MI_SIZE_LOG2, xd);
-              mbmi_ext->ref_mvs[mbmi->ref_frame[ref]][0] = this_mv;
-            }
+            int_mv this_mv =
+                mbmi_ext->ref_mv_stack[ref_frame_type][mbmi->ref_mv_idx]
+                    .this_mv;
+            clamp_mv_ref(&this_mv.as_mv, xd->n8_w << MI_SIZE_LOG2,
+                         xd->n8_h << MI_SIZE_LOG2, xd);
+            mbmi_ext->ref_mvs[mbmi->ref_frame[0]][0] = this_mv;
           }
 
           cur_mv =