commit 1e92b083864aa65a4ffae9b9cfa8648614ee711e
author Debargha Mukherjee <debargha@google.com> Thu Nov 01 16:21:32 2018 -0700
committer Debargha Mukherjee <debargha@google.com> Fri Nov 02 18:32:39 2018 +0000
tree 04023f024af04018a7962a5f72e835b125ce146e
parent 24ec46409597a061ee36c6be502e584494411118

Fix and adjust early termination for compound

Removes a redundant and a buggy code segment related to
early termination, and adjust early termination strategies.

Provides up to a 6% speedup on speed 0 with 0.029% loss as
tested on lowres 30 frames.

STATS_CHANGED

Change-Id: I03f47691dca23e5f18f75249deabaf36413bad28

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 9cfbff9..ba0b74a 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9726,12 +9726,7 @@
         mbmi->motion_mode = SIMPLE_TRANSLATION;
         mbmi->comp_group_idx = 0;
 
-        const int comp_group_idx_ctx = get_comp_group_idx_context(xd);
         const int comp_index_ctx = get_comp_index_context(cm, xd);
-        if (masked_compound_used) {
-          compmode_interinter_cost +=
-              x->comp_group_idx_cost[comp_group_idx_ctx][0];
-        }
         compmode_interinter_cost += x->comp_idx_cost[comp_index_ctx][0];
       }
 
@@ -9878,7 +9873,8 @@
             cpi, x, bsize, mi_col, mi_row, cur_mv, masked_compound_used,
             &orig_dst, &tmp_dst, rd_buffers, &rate_mv, &best_rd_compound,
             rd_stats, ref_best_rd);
-        if (ref_best_rd < INT64_MAX && best_rd_compound / 3 > ref_best_rd) {
+        if (ref_best_rd < INT64_MAX &&
+            (best_rd_compound >> 3) * 6 > ref_best_rd) {
           restore_dst_buf(xd, orig_dst, num_planes);
           continue;
         }
@@ -9907,17 +9903,7 @@
       } else if (cpi->sf.model_based_post_interp_filter_breakout &&
                  ref_best_rd != INT64_MAX && (rd >> 3) * 3 > ref_best_rd) {
         restore_dst_buf(xd, orig_dst, num_planes);
-        if ((rd >> 3) * 2 > ref_best_rd) break;
-        continue;
-      }
-
-      if (search_jnt_comp) {
-        // if 1/2 model rd is larger than best_rd in jnt_comp mode,
-        // use jnt_comp mode, save additional search
-        if ((rd >> 3) * 4 > best_rd) {
-          restore_dst_buf(xd, orig_dst, num_planes);
-          continue;
-        }
+        break;
       }
 
       if (!is_comp_pred)