shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removing vp9_is_interpolating_filter array."

--- a/vp9/common/vp9_entropymode.c

+++ b/vp9/common/vp9_entropymode.c

@@ -347,9 +347,6 @@

   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,

--- a/vp9/common/vp9_entropymode.h

+++ b/vp9/common/vp9_entropymode.h

@@ -53,7 +53,6 @@

                  [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)];

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -2900,8 +2900,7 @@

       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);