commit 0df711f29c4b5e16947f33bc7dc1cf4630fd101e
author Debargha Mukherjee <debargha@google.com> Tue May 02 16:00:20 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Wed May 03 02:08:56 2017 +0000
tree 7b69c70708c9e674654c9a509f4f0c3e2d5b2a57
parent 8f37b162948fec16edb553687fce2ecb81b35ac1

Fix and cleanup interpolation filter assignments

BUG=aomedia:490
BUG=aomedia:491
BUG=aomedia:494

Change-Id: I20a375dc6f76a3f3de520e452b3b9b0d4ace0ee0

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 9531e6c..29f206a 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -7974,26 +7974,17 @@
 
   if (cm->interp_filter == SWITCHABLE) {
 #if !CONFIG_DUAL_FILTER
-    assign_filter =
-        predict_interp_filter(cpi, x, bsize, mi_row, mi_col, single_filter);
+    assign_filter = av1_is_interp_needed(xd)
+                        ? predict_interp_filter(cpi, x, bsize, mi_row, mi_col,
+                                                single_filter)
+                        : cm->interp_filter;
 #endif  // !CONFIG_DUAL_FILTER
   } else {
     assign_filter = cm->interp_filter;
   }
 
-#if CONFIG_DUAL_FILTER
-  mbmi->interp_filter[0] =
-      assign_filter == SWITCHABLE ? EIGHTTAP_REGULAR : assign_filter;
-  mbmi->interp_filter[1] =
-      assign_filter == SWITCHABLE ? EIGHTTAP_REGULAR : assign_filter;
-  mbmi->interp_filter[2] =
-      assign_filter == SWITCHABLE ? EIGHTTAP_REGULAR : assign_filter;
-  mbmi->interp_filter[3] =
-      assign_filter == SWITCHABLE ? EIGHTTAP_REGULAR : assign_filter;
-#else
-  mbmi->interp_filter =
-      assign_filter == SWITCHABLE ? EIGHTTAP_REGULAR : assign_filter;
-#endif  // CONFIG_DUAL_FILTER
+  set_default_interp_filters(mbmi, assign_filter);
+
   *switchable_rate = av1_get_switchable_rate(cpi, xd);
   av1_build_inter_predictors_sb(xd, mi_row, mi_col, orig_dst, bsize);
   model_rd_for_sb(cpi, bsize, x, xd, 0, MAX_MB_PLANE - 1, &tmp_rate, &tmp_dist,
@@ -8002,7 +7993,7 @@
 
   if (assign_filter == SWITCHABLE) {
     // do interp_filter search
-    if (av1_is_interp_needed(xd)) {
+    if (av1_is_interp_needed(xd) && av1_is_interp_search_needed(xd)) {
 #if CONFIG_DUAL_FILTER
       const int filter_set_size = DUAL_FILTER_SET_SIZE;
 #else
@@ -10175,16 +10166,9 @@
 #endif  // CONFIG_FILTER_INTRA
         // Evaluate all sub-pel filters irrespective of whether we can use
         // them for this frame.
-#if CONFIG_DUAL_FILTER
-    for (i = 0; i < 4; ++i) {
-      mbmi->interp_filter[i] = cm->interp_filter == SWITCHABLE
-                                   ? EIGHTTAP_REGULAR
-                                   : cm->interp_filter;
-    }
-#else
-    mbmi->interp_filter =
-        cm->interp_filter == SWITCHABLE ? EIGHTTAP_REGULAR : cm->interp_filter;
-#endif  // CONFIG_DUAL_FILTER
+
+    set_default_interp_filters(mbmi, cm->interp_filter);
+
     mbmi->mv[0].as_int = mbmi->mv[1].as_int = 0;
     mbmi->motion_mode = SIMPLE_TRANSLATION;
 
@@ -11532,9 +11516,13 @@
   }
 #endif
 
-  if (cm->interp_filter != BILINEAR) {
+  set_default_interp_filters(mbmi, cm->interp_filter);
+
+  if (cm->interp_filter != SWITCHABLE) {
+    best_filter = cm->interp_filter;
+  } else {
     best_filter = EIGHTTAP_REGULAR;
-    if (cm->interp_filter == SWITCHABLE &&
+    if (av1_is_interp_needed(xd) && av1_is_interp_search_needed(xd) &&
         x->source_variance >= cpi->sf.disable_filter_search_var_thresh) {
       int rs;
       int best_rs = INT_MAX;
@@ -11557,21 +11545,13 @@
       }
     }
   }
-  // Set the appropriate filter
-  if (cm->interp_filter == SWITCHABLE) {
+// Set the appropriate filter
 #if CONFIG_DUAL_FILTER
-    for (i = 0; i < 4; ++i) mbmi->interp_filter[i] = best_filter;
+  for (i = 0; i < 4; ++i) mbmi->interp_filter[i] = best_filter;
 #else
-    mbmi->interp_filter = best_filter;
+  mbmi->interp_filter = best_filter;
 #endif  // CONFIG_DUAL_FILTER
-    rate2 += av1_get_switchable_rate(cpi, xd);
-  } else {
-#if CONFIG_DUAL_FILTER
-    for (i = 0; i < 4; ++i) mbmi->interp_filter[i] = cm->interp_filter;
-#else
-    mbmi->interp_filter = cm->interp_filter;
-#endif  // CONFIG_DUAL_FILTER
-  }
+  rate2 += av1_get_switchable_rate(cpi, xd);
 
   if (cm->reference_mode == REFERENCE_MODE_SELECT)
     rate2 += av1_cost_bit(comp_mode_p, comp_pred);