commit 1733f6b77b96b87db02f7f37c4ab8c01a530b983
author Angie Chiang <angiebird@google.com> Thu Jan 05 09:52:20 2017 -0800
committer Angie Chiang <angiebird@google.com> Sat Jan 07 00:50:23 2017 +0000
tree bfd84655e08cc3d236d4accaf67ad3f839f028ad
parent 4be1a4d49ba70339132242c601b6690494d4e63d

Merge ext_interp and dual_filter

Change-Id: I0ebd6951d2b42869ae872b33f63a07db03e99c62

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 64b94b9..5771946 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -849,15 +849,10 @@
 int av1_get_switchable_rate(const AV1_COMP *cpi, const MACROBLOCKD *xd) {
   const AV1_COMMON *const cm = &cpi->common;
   if (cm->interp_filter == SWITCHABLE) {
-#if CONFIG_EXT_INTERP
-    if (av1_is_interp_needed(xd))
-#endif
-    {
-      const MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
-      const int ctx = av1_get_pred_context_switchable_interp(xd);
-      return SWITCHABLE_INTERP_RATE_FACTOR *
-             cpi->switchable_interp_costs[ctx][mbmi->interp_filter];
-    }
+    const MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
+    const int ctx = av1_get_pred_context_switchable_interp(xd);
+    return SWITCHABLE_INTERP_RATE_FACTOR *
+           cpi->switchable_interp_costs[ctx][mbmi->interp_filter];
   }
   return 0;
 }