These wrappers around ff_vvc_apply_bdof_avx2() are only used in dsp_init.c.
Showing the changes to libavcodec (1 of 1 file). Show all
Unified · Split
| @@ -71,20 +71,13 @@ DMVR_PROTOTYPES( 8, avx2) · 70 unmodified lines | ||
| 71 | 71 | DMVR_PROTOTYPES(10, avx2) |
| 72 | 72 | DMVR_PROTOTYPES(12, avx2) |
| 73 | 73 | |
| 74 | −#define OF_PROTOTYPES(bd, opt) \ | |
| 75 | −void ff_vvc_apply_bdof_##bd##_##opt(uint8_t *dst, ptrdiff_t dst_stride, \ | |
| 76 | − const int16_t *src0, const int16_t *src1, int w, int h); \ | |
| 77 | − | |
| 78 | −OF_PROTOTYPES( 8, avx2) | |
| 79 | −OF_PROTOTYPES(10, avx2) | |
| 80 | −OF_PROTOTYPES(12, avx2) | |
| 81 | − | |
| 82 | 74 | #if ARCH_X86_64 && HAVE_AVX2_EXTERNAL |
| 83 | −void ff_vvc_apply_bdof_avx2(uint8_t *dst, ptrdiff_t dst_stride, \ | |
| 84 | − const int16_t *src0, const int16_t *src1, int w, int h, int pixel_max); \ | |
| 75 | +void ff_vvc_apply_bdof_avx2(uint8_t *dst, ptrdiff_t dst_stride, | |
| 76 | + const int16_t *src0, const int16_t *src1, | |
| 77 | + int w, int h, int pixel_max); | |
| 85 | 78 | |
| 86 | 79 | #define OF_FUNC(bd, opt) \ |
| 87 | −void ff_vvc_apply_bdof_##bd##_##opt(uint8_t *dst, ptrdiff_t dst_stride, \ | |
| 80 | +static void vvc_apply_bdof_##bd##_##opt(uint8_t *dst, ptrdiff_t dst_stride, \ | |
| 88 | 81 | const int16_t *src0, const int16_t *src1, int w, int h) \ |
| 89 | 82 | { \ |
| 90 | 83 | ff_vvc_apply_bdof##_##opt(dst, dst_stride, src0, src1, w, h, (1 << bd) - 1); \ |
| @@ -93,6 +86,8 @@ void ff_vvc_apply_bdof_##bd##_##opt(uint8_t *dst, ptrdiff_t dst_stride, · 2 unmodified lines | ||
| 93 | 86 | OF_FUNC( 8, avx2) |
| 94 | 87 | OF_FUNC(10, avx2) |
| 95 | 88 | OF_FUNC(12, avx2) |
| 89 | + | |
| 90 | +#define OF_INIT(bd) c->inter.apply_bdof = vvc_apply_bdof_##bd##_avx2 | |
| 96 | 91 | #endif |
| 97 | 92 | |
| 98 | 93 | #define ALF_BPC_PROTOTYPES(bpc, opt) \ |
| @@ -321,10 +316,6 @@ ALF_FUNCS(16, 12, avx2) · 222 unmodified lines | ||
| 321 | 316 | c->inter.dmvr[1][1] = ff_vvc_dmvr_hv_##bd##_avx2; \ |
| 322 | 317 | } while (0) |
| 323 | 318 | |
| 324 | −#define OF_INIT(bd) do { \ | |
| 325 | − c->inter.apply_bdof = ff_vvc_apply_bdof_##bd##_avx2; \ | |
| 326 | −} while (0) | |
| 327 | − | |
| 328 | 319 | #define ALF_INIT(bd) do { \ |
| 329 | 320 | c->alf.filter[LUMA] = ff_vvc_alf_filter_luma_##bd##_avx2; \ |
| 330 | 321 | c->alf.filter[CHROMA] = ff_vvc_alf_filter_chroma_##bd##_avx2; \ |