diff options
Diffstat (limited to 'vp9/common')
-rw-r--r-- | vp9/common/vp9_filter.c | 8 | ||||
-rw-r--r-- | vp9/common/vp9_filter.h | 2 | ||||
-rw-r--r-- | vp9/common/vp9_reconinter.c | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/vp9/common/vp9_filter.c b/vp9/common/vp9_filter.c index 14654a5ab..4b2198fc4 100644 --- a/vp9/common/vp9_filter.c +++ b/vp9/common/vp9_filter.c @@ -96,15 +96,9 @@ DECLARE_ALIGNED(256, static const InterpKernel, }; -static const InterpKernel* filter_kernels[4] = { +const InterpKernel *vp9_filter_kernels[4] = { sub_pel_filters_8, sub_pel_filters_8lp, sub_pel_filters_8s, bilinear_filters }; - -const InterpKernel *vp9_get_interp_kernel(INTERP_FILTER filter) { - assert(filter != SWITCHABLE); - return filter_kernels[filter]; -} - diff --git a/vp9/common/vp9_filter.h b/vp9/common/vp9_filter.h index 13d38affb..40d6a0d6a 100644 --- a/vp9/common/vp9_filter.h +++ b/vp9/common/vp9_filter.h @@ -40,7 +40,7 @@ typedef uint8_t INTERP_FILTER; typedef int16_t InterpKernel[SUBPEL_TAPS]; -const InterpKernel *vp9_get_interp_kernel(INTERP_FILTER filter); +extern const InterpKernel *vp9_filter_kernels[4]; #ifdef __cplusplus } // extern "C" diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c index be5a1507d..6d38fabd1 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c @@ -161,7 +161,7 @@ void build_inter_predictors(MACROBLOCKD *xd, int plane, int block, struct macroblockd_plane *const pd = &xd->plane[plane]; const MODE_INFO *mi = xd->mi[0]; const int is_compound = has_second_ref(&mi->mbmi); - const InterpKernel *kernel = vp9_get_interp_kernel(mi->mbmi.interp_filter); + const InterpKernel *kernel = vp9_filter_kernels[mi->mbmi.interp_filter]; int ref; for (ref = 0; ref < 1 + is_compound; ++ref) { |