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/common/reconinter.h

diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h
index d59ad03..10933a7 100644
--- a/av1/common/reconinter.h
+++ b/av1/common/reconinter.h
@@ -686,7 +686,33 @@
 #endif
 }
 
+static INLINE void set_default_interp_filters(
+    MB_MODE_INFO *const mbmi, InterpFilter frame_interp_filter) {
+#if CONFIG_DUAL_FILTER
+  int dir;
+  for (dir = 0; dir < 4; ++dir)
+    mbmi->interp_filter[dir] = frame_interp_filter == SWITCHABLE
+                                   ? EIGHTTAP_REGULAR
+                                   : frame_interp_filter;
+#else
+  mbmi->interp_filter = frame_interp_filter == SWITCHABLE ? EIGHTTAP_REGULAR
+                                                          : frame_interp_filter;
+#endif  // CONFIG_DUAL_FILTER
+}
+
 static INLINE int av1_is_interp_needed(const MACROBLOCKD *const xd) {
+  (void)xd;
+#if CONFIG_WARPED_MOTION
+  const MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
+  if (mbmi->motion_mode == WARPED_CAUSAL) return 0;
+#endif  // CONFIG_WARPED_MOTION
+#if CONFIG_GLOBAL_MOTION
+  if (is_nontrans_global_motion(xd)) return 0;
+#endif  // CONFIG_GLOBAL_MOTION
+  return 1;
+}
+
+static INLINE int av1_is_interp_search_needed(const MACROBLOCKD *const xd) {
   MODE_INFO *const mi = xd->mi[0];
   const int is_compound = has_second_ref(&mi->mbmi);
   int ref;