Commit 333345cd authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review

Merge "Convert filter kernel choice to lookup"

parents 340b2b07 0f76ba55
......@@ -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];
}
......@@ -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];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment