Commit a4cfcddc authored by Martin Storsjö's avatar Martin Storsjö

vp9: Make the subpel filters non-static

Make them aligned, to allow efficient access to them from simd.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 98cae966
...@@ -431,6 +431,8 @@ typedef struct VP9Context { ...@@ -431,6 +431,8 @@ typedef struct VP9Context {
DECLARE_ALIGNED(32, uint8_t, tmp_uv)[2][32 * 32]; DECLARE_ALIGNED(32, uint8_t, tmp_uv)[2][32 * 32];
} VP9Context; } VP9Context;
extern const int8_t ff_vp9_subpel_filters[3][15][8];
void ff_vp9dsp_init(VP9DSPContext *dsp); void ff_vp9dsp_init(VP9DSPContext *dsp);
void ff_vp9dsp_init_arm(VP9DSPContext *dsp); void ff_vp9dsp_init_arm(VP9DSPContext *dsp);
......
...@@ -1786,7 +1786,7 @@ copy_avg_fn(4) ...@@ -1786,7 +1786,7 @@ copy_avg_fn(4)
#undef fpel_fn #undef fpel_fn
#undef copy_avg_fn #undef copy_avg_fn
static const int8_t vp9_subpel_filters[3][15][8] = { const DECLARE_ALIGNED(8, int8_t, ff_vp9_subpel_filters)[3][15][8] = {
[FILTER_8TAP_REGULAR] = { [FILTER_8TAP_REGULAR] = {
{ 0, 1, -5, 126, 8, -3, 1, 0 }, { 0, 1, -5, 126, 8, -3, 1, 0 },
{ -1, 3, -10, 122, 18, -6, 2, 0 }, { -1, 3, -10, 122, 18, -6, 2, 0 },
...@@ -1948,7 +1948,7 @@ avg ## _8tap_ ## type ## _ ## sz ## dir ## _c(uint8_t *dst, \ ...@@ -1948,7 +1948,7 @@ avg ## _8tap_ ## type ## _ ## sz ## dir ## _c(uint8_t *dst, \
int h, int mx, int my) \ int h, int mx, int my) \
{ \ { \
avg ## _8tap_1d_ ## dir ## _c(dst, dst_stride, src, src_stride, sz, h, \ avg ## _8tap_1d_ ## dir ## _c(dst, dst_stride, src, src_stride, sz, h, \
vp9_subpel_filters[type_idx][dir_m - 1]); \ ff_vp9_subpel_filters[type_idx][dir_m - 1]); \
} }
#define filter_fn_2d(sz, type, type_idx, avg) \ #define filter_fn_2d(sz, type, type_idx, avg) \
...@@ -1959,8 +1959,8 @@ static void avg ## _8tap_ ## type ## _ ## sz ## hv_c(uint8_t *dst, \ ...@@ -1959,8 +1959,8 @@ static void avg ## _8tap_ ## type ## _ ## sz ## hv_c(uint8_t *dst, \
int h, int mx, int my) \ int h, int mx, int my) \
{ \ { \
avg ## _8tap_2d_hv_c(dst, dst_stride, src, src_stride, sz, h, \ avg ## _8tap_2d_hv_c(dst, dst_stride, src, src_stride, sz, h, \
vp9_subpel_filters[type_idx][mx - 1], \ ff_vp9_subpel_filters[type_idx][mx - 1], \
vp9_subpel_filters[type_idx][my - 1]); \ ff_vp9_subpel_filters[type_idx][my - 1]); \
} }
#define FILTER_BILIN(src, x, mxy, stride) \ #define FILTER_BILIN(src, x, mxy, stride) \
......
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