diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-11-01 09:40:20 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2013-11-01 13:03:18 -0700 |
| commit | 0f76ba5523e88e332f4ca1832b658a4e674af673 (patch) | |
| tree | c96470a611d441fab19235f1a44cc8abd01bad2b /vp9 | |
| parent | a272530bf0962d4cbf54fdb8abd1051f8fbb5917 (diff) | |
| download | libvpx-0f76ba5523e88e332f4ca1832b658a4e674af673.tar libvpx-0f76ba5523e88e332f4ca1832b658a4e674af673.tar.gz libvpx-0f76ba5523e88e332f4ca1832b658a4e674af673.tar.bz2 libvpx-0f76ba5523e88e332f4ca1832b658a4e674af673.zip | |
Convert filter kernel choice to lookup
Also removed unused declaration related 6 tap filter
Change-Id: Ic17f516141d885157918505f4204081e4c951fad
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_filter.c | 22 | ||||
| -rw-r--r-- | vp9/common/vp9_filter.h | 1 |
2 files changed, 9 insertions, 14 deletions
diff --git a/vp9/common/vp9_filter.c b/vp9/common/vp9_filter.c index 8f24052c7..79ace147c 100644 --- a/vp9/common/vp9_filter.c +++ b/vp9/common/vp9_filter.c @@ -97,19 +97,15 @@ DECLARE_ALIGNED(256, const subpel_kernel, { 0, -3, 1, 38, 64, 32, -1, -3} }; + +static const subpel_kernel* vp9_filter_kernels[4] = { + vp9_sub_pel_filters_8, + vp9_sub_pel_filters_8lp, + vp9_sub_pel_filters_8s, + vp9_bilinear_filters +}; + const subpel_kernel *vp9_get_filter_kernel(INTERPOLATION_TYPE type) { - switch (type) { - case EIGHTTAP: - return vp9_sub_pel_filters_8; - case EIGHTTAP_SMOOTH: - return vp9_sub_pel_filters_8lp; - case EIGHTTAP_SHARP: - return vp9_sub_pel_filters_8s; - case BILINEAR: - return vp9_bilinear_filters; - default: - assert(!"Invalid interpolation type."); - return NULL; - } + return vp9_filter_kernels[type]; } diff --git a/vp9/common/vp9_filter.h b/vp9/common/vp9_filter.h index 8652a6e3b..b1e7e6499 100644 --- a/vp9/common/vp9_filter.h +++ b/vp9/common/vp9_filter.h @@ -39,7 +39,6 @@ struct subpix_fn_table { const subpel_kernel *vp9_get_filter_kernel(INTERPOLATION_TYPE type); extern const subpel_kernel vp9_bilinear_filters[SUBPEL_SHIFTS]; -extern const subpel_kernel vp9_sub_pel_filters_6[SUBPEL_SHIFTS]; extern const subpel_kernel vp9_sub_pel_filters_8[SUBPEL_SHIFTS]; extern const subpel_kernel vp9_sub_pel_filters_8s[SUBPEL_SHIFTS]; extern const subpel_kernel vp9_sub_pel_filters_8lp[SUBPEL_SHIFTS]; |