commit 1b5bd29ddf976ba8ea6ce07e64f1367185d18036
author Angie Chiang <angiebird@google.com> Tue Feb 21 16:33:24 2017 -0800
committer Angie Chiang <angiebird@google.com> Wed Feb 22 19:32:15 2017 +0000
tree 4dd9a9da315bb1e844a3ca059abf8ff30fc044d2
parent ea576f3e418e01a9d50c8c6ec02aa672eb9f38cc

Remove redundant full-pixel check from rdopt.c

Change-Id: I1d599b70fb338de4b0d2076fdc7060361a46c21f

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 61fcf32..2f0c15c 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -7925,7 +7925,6 @@
   int64_t rd = INT64_MAX;
   BUFFER_SET orig_dst, tmp_dst;
   int rs = 0;
-  InterpFilter assign_filter = SWITCHABLE;
 
   int skip_txfm_sb = 0;
   int64_t skip_sse_sb = INT64_MAX;
@@ -8218,10 +8217,10 @@
       )
     return INT64_MAX;
 
+  InterpFilter assign_filter = SWITCHABLE;
+
   if (cm->interp_filter == SWITCHABLE) {
-#if CONFIG_DUAL_FILTER
-    if (!av1_is_interp_needed(xd)) assign_filter = EIGHTTAP_REGULAR;
-#else
+#if !CONFIG_DUAL_FILTER
     assign_filter =
         predict_interp_filter(cpi, x, bsize, mi_row, mi_col, single_filter);
 #endif
@@ -8617,12 +8616,6 @@
         av1_cost_bit(cm->fc->interintra_prob[size_group_lookup[bsize]], 0);
   }
 
-#if CONFIG_DUAL_FILTER
-  if (!av1_is_interp_needed(xd) && cm->interp_filter == SWITCHABLE) {
-    for (i = 0; i < 4; ++i) mbmi->interp_filter[i] = EIGHTTAP_REGULAR;
-    pred_exists = 0;
-  }
-#endif  // CONFIG_DUAL_FILTER
   if (pred_exists == 0) {
     int tmp_rate;
     int64_t tmp_dist;
@@ -8724,9 +8717,6 @@
           mbmi->interp_filter[0] = EIGHTTAP_REGULAR;
         if (!has_subpel_mv_component(xd->mi[0], xd, 1))
           mbmi->interp_filter[1] = EIGHTTAP_REGULAR;
-        // This is not quite correct with CONFIG_DUAL_FILTER when a filter
-        // is needed in only one direction
-        if (!av1_is_interp_needed(xd)) tmp_rate2 -= rs;
 #endif  // CONFIG_DUAL_FILTER
         av1_build_inter_predictors_sb(xd, mi_row, mi_col, &orig_dst, bsize);
 #if CONFIG_EXT_INTER
@@ -11229,9 +11219,6 @@
   if (cm->interp_filter != BILINEAR) {
     best_filter = EIGHTTAP_REGULAR;
     if (cm->interp_filter == SWITCHABLE &&
-#if CONFIG_DUAL_FILTER
-        av1_is_interp_needed(xd) &&
-#endif  // CONFIG_DUAL_FILTER
         x->source_variance >= cpi->sf.disable_filter_search_var_thresh) {
       int rs;
       int best_rs = INT_MAX;
@@ -11743,12 +11730,6 @@
                 compound_seg_newmvs,
 #endif  // CONFIG_EXT_INTER
                 bsi, switchable_filter_index, mi_row, mi_col);
-#if CONFIG_DUAL_FILTER
-            if (!av1_is_interp_needed(xd) && cm->interp_filter == SWITCHABLE &&
-                (mbmi->interp_filter[0] != EIGHTTAP_REGULAR ||
-                 mbmi->interp_filter[1] != EIGHTTAP_REGULAR))  // invalid config
-              continue;
-#endif  // CONFIG_DUAL_FILTER
             if (tmp_rd == INT64_MAX) continue;
             rs = av1_get_switchable_rate(cpi, xd);
             rs_rd = RDCOST(x->rdmult, x->rddiv, rs, 0);
@@ -11822,14 +11803,6 @@
             compound_seg_newmvs,
 #endif  // CONFIG_EXT_INTER
             bsi, 0, mi_row, mi_col);
-#if CONFIG_DUAL_FILTER
-        if (!av1_is_interp_needed(xd) && cm->interp_filter == SWITCHABLE &&
-            (mbmi->interp_filter[0] != EIGHTTAP_REGULAR ||
-             mbmi->interp_filter[1] != EIGHTTAP_REGULAR)) {
-          mbmi->interp_filter[0] = EIGHTTAP_REGULAR;
-          mbmi->interp_filter[1] = EIGHTTAP_REGULAR;
-        }
-#endif  // CONFIG_DUAL_FILTER
         if (tmp_rd == INT64_MAX) continue;
       } else {
         total_sse = tmp_best_sse;