commit 65d65993b74ed850727df6ba215510f7faa03877
author Yunqing Wang <yunqingwang@google.com> Wed Apr 01 12:26:00 2020 -0700
committer Yunqing Wang <yunqingwang@google.com> Wed Apr 01 22:18:25 2020 +0000
tree a80e64f74e39075687254d9e1ca06601a83bf714
parent 0c66adbd25a9b9c9b9c407d9002833b2f423949d

Filter code cleanup

Change-Id: Icbb9ba239166bd1fc532b5bbb857cc0cf66acabd

av1/common/filter.h

diff --git a/av1/common/filter.h b/av1/common/filter.h
index 3fa18d3..91791d3 100644
--- a/av1/common/filter.h
+++ b/av1/common/filter.h
@@ -94,7 +94,6 @@
 /* (1 << LOG_SWITCHABLE_FILTERS) > SWITCHABLE_FILTERS */
 #define LOG_SWITCHABLE_FILTERS 2
 
-#define MAX_SUBPEL_TAPS 12
 #define SWITCHABLE_FILTER_CONTEXTS ((SWITCHABLE_FILTERS + 1) * 4)
 #define INTER_FILTER_COMP_OFFSET (SWITCHABLE_FILTERS + 1)
 #define INTER_FILTER_DIR_OFFSET ((SWITCHABLE_FILTERS + 1) * 2)
@@ -231,11 +230,6 @@
   return &av1_interp_filter_params_list[interp_filter];
 }
 
-static INLINE const InterpFilterParams *get_4tap_interp_filter_params(
-    const InterpFilter interp_filter) {
-  return &av1_interp_4tap[interp_filter];
-}
-
 static INLINE const int16_t *av1_get_interp_filter_kernel(
     const InterpFilter interp_filter, int subpel_search) {
   assert(subpel_search >= USE_2_TAPS);
@@ -255,8 +249,8 @@
   assert(subpel_search >= USE_2_TAPS);
 
   switch (subpel_search) {
-    case USE_2_TAPS: return get_4tap_interp_filter_params(BILINEAR);
-    case USE_4_TAPS: return get_4tap_interp_filter_params(EIGHTTAP_REGULAR);
+    case USE_2_TAPS: return &av1_interp_4tap[BILINEAR];
+    case USE_4_TAPS: return &av1_interp_4tap[EIGHTTAP_REGULAR];
     case USE_8_TAPS: return &av1_interp_filter_params_list[EIGHTTAP_REGULAR];
     default: assert(0); return NULL;
   }