commit 203b1d30a6821c638c8287511dd25065c223fa2c
author Jingning Han <jingning@google.com> Thu Jan 12 16:00:13 2017 -0800
committer Jingning Han <jingning@google.com> Fri Jan 13 01:51:24 2017 +0000
tree 74d7eba34faf266471c6bbf726bd5b0d16e92bfd
parent 64550b6af41db947a0067126cd54fa76274139a6

Clean up redundant #if statements

Change-Id: Ia4779ffb47de333d670ae110cbdfb6cc567da910

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 036eea0..fc5b8a3 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1072,17 +1072,15 @@
                                    aom_writer *w) {
   AV1_COMMON *const cm = &cpi->common;
   const MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
-#if CONFIG_DUAL_FILTER
-  int dir;
-#endif
+
   if (cm->interp_filter == SWITCHABLE) {
 #if CONFIG_DUAL_FILTER
+    int dir;
     if (!av1_is_interp_needed(xd)) {
       assert(mbmi->interp_filter[0] == EIGHTTAP_REGULAR);
       return;
     }
-#endif  // CONFIG_DUAL_FILTER
-#if CONFIG_DUAL_FILTER
+
     for (dir = 0; dir < 2; ++dir) {
       if (has_subpel_mv_component(xd->mi[0], xd, dir) ||
           (mbmi->ref_frame[1] > INTRA_FRAME &&
@@ -1107,7 +1105,7 @@
 #endif
       ++cpi->interp_filter_selected[0][mbmi->interp_filter];
     }
-#endif
+#endif  // CONFIG_DUAL_FILTER
   }
 }
 

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index d0f0b99..00bfc61 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -7448,12 +7448,11 @@
     return INT64_MAX;
 
   if (cm->interp_filter == SWITCHABLE) {
-#if !CONFIG_DUAL_FILTER
-    assign_filter =
-        predict_interp_filter(cpi, x, bsize, mi_row, mi_col, single_filter);
-#endif
 #if CONFIG_DUAL_FILTER
     if (!av1_is_interp_needed(xd)) assign_filter = EIGHTTAP_REGULAR;
+#else
+    assign_filter =
+        predict_interp_filter(cpi, x, bsize, mi_row, mi_col, single_filter);
 #endif
   } else {
     assign_filter = cm->interp_filter;