Removing vp9_is_interpolating_filter array.

All filters are interpolating now, so we don't need this array, all
values from this array are evaluated to true.

Change-Id: I9af6d8219ae0eb984063cd15e4e2296374ae4961

diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c
index 0e52e09876ec3936daed40e4a3589925871b5e8d..fe16423e1ccf0a64a12563cdca10a0efca75f1d7 100644 (file)
--- a/vp9/common/vp9_entropymode.c
+++ b/vp9/common/vp9_entropymode.c
@@ -347,9 +347,6 @@ const INTERPOLATIONFILTERTYPE vp9_switchable_interp[VP9_SWITCHABLE_FILTERS] = {
   EIGHTTAP, EIGHTTAP_SMOOTH, EIGHTTAP_SHARP};
 const int vp9_switchable_interp_map[SWITCHABLE + 1] = {1, 0, 2, -1, -1};
 
-// Indicates if the filter is interpolating or non-interpolating
-const int vp9_is_interpolating_filter[SWITCHABLE + 1] = {1, 1, 1, 1, -1};
-
 void vp9_entropy_mode_init() {
   vp9_tokens_from_tree(vp9_intra_mode_encodings, vp9_intra_mode_tree);
   vp9_tokens_from_tree(vp9_switchable_interp_encodings,

diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h
index 613657be7964e676bec9a7394e31b0b692801014..68b996a4e6e72eb85a0e23140b38188bc47c7c7d 100644 (file)
--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -53,7 +53,6 @@ extern const INTERPOLATIONFILTERTYPE vp9_switchable_interp
                  [VP9_SWITCHABLE_FILTERS];
 
 extern const int vp9_switchable_interp_map[SWITCHABLE + 1];
-extern const int vp9_is_interpolating_filter[SWITCHABLE + 1];
 
 extern const vp9_tree_index vp9_switchable_interp_tree
                  [2 * (VP9_SWITCHABLE_FILTERS - 1)];

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index df138f716d86b49176879bc485114c98032f833f..784d1bad250f0edbca962730d4acf9cd7257ca27 100644 (file)
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2900,8 +2900,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
       int j;
       int64_t rs_rd;
       const INTERPOLATIONFILTERTYPE filter = vp9_switchable_interp[i];
-      const int is_intpel_interp = intpel_mv &&
-          vp9_is_interpolating_filter[filter];
+      const int is_intpel_interp = intpel_mv;
       mbmi->interp_filter = filter;
       vp9_setup_interp_filters(xd, mbmi->interp_filter, cm);
       rs = get_switchable_rate(cm, x);