Remove WARP_GM/WM_NEIGHBORS_WITH_OBMC macros

The adopted version of the OBMC tool mandates these to be 0

Change-Id: I7f09ac603965a43e8fa4f33f73a0f4023405e7c8

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 6fc9f0e..b5c11e4 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -57,13 +57,12 @@
   if (gm_params->invalid) return 0;
 
   if (warp_types->local_warp_allowed) {
-    if ((build_for_obmc && WARP_WM_NEIGHBORS_WITH_OBMC) || (!build_for_obmc)) {
+    if (!build_for_obmc) {
       memcpy(final_warp_params, &mbmi->wm_params[0],
              sizeof(*final_warp_params));
       return 1;
     }
-  } else if (warp_types->global_warp_allowed &&
-             (WARP_GM_NEIGHBORS_WITH_OBMC || !build_for_obmc)) {
+  } else if (warp_types->global_warp_allowed && !build_for_obmc) {
     memcpy(final_warp_params, gm_params, sizeof(*final_warp_params));
     return 1;
   }

av1/common/reconinter.h

diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h
index 22a3a1b..f47b11a 100644
--- a/av1/common/reconinter.h
+++ b/av1/common/reconinter.h
@@ -18,10 +18,6 @@
 #include "av1/common/warped_motion.h"
 #include "aom/aom_integer.h"
 
-#define WARP_WM_NEIGHBORS_WITH_OBMC 0
-
-#define WARP_GM_NEIGHBORS_WITH_OBMC 0
-
 // Work out how many pixels off the edge of a reference frame we're allowed
 // to go when forming an inter prediction.
 // The outermost row/col of each referernce frame is extended by

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 2547ac8..a22c853 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2182,8 +2182,7 @@
       // Only one filter is used. So set the filter at frame level
       for (i = 0; i < SWITCHABLE_FILTERS; ++i) {
         if (count[i]) {
-          if (i == EIGHTTAP_REGULAR || WARP_WM_NEIGHBORS_WITH_OBMC)
-            cm->interp_filter = i;
+          if (i == EIGHTTAP_REGULAR) cm->interp_filter = i;
           break;
         }
       }