[FFmpeg-devel] [PATCH 1/3] avfilter: move bwdif's filter_line init into a dedicated function

[Thomas Mundt]

Hi James,

James Darnley <jdarnley at obe.tv> schrieb am Mo., 20. Feb. 2023, 13:59:

> ---
>  libavfilter/bwdif.h             |  3 ++-
>  libavfilter/vf_bwdif.c          | 13 +++++++++----
>  libavfilter/x86/vf_bwdif_init.c |  4 +---
>  3 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/libavfilter/bwdif.h b/libavfilter/bwdif.h
> index 889ff772ed..5749345f78 100644
> --- a/libavfilter/bwdif.h
> +++ b/libavfilter/bwdif.h
> @@ -37,6 +37,7 @@ typedef struct BWDIFContext {
>                          int parity, int clip_max, int spat);
>  } BWDIFContext;
>
> -void ff_bwdif_init_x86(BWDIFContext *bwdif);
> +void ff_bwdif_init_filter_line(BWDIFContext *bwdif, int bit_depth);
> +void ff_bwdif_init_x86(BWDIFContext *bwdif, int bit_depth);
>
>  #endif /* AVFILTER_BWDIF_H */
> diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c
> index 65c617ebb3..34e8c5e234 100644
> --- a/libavfilter/vf_bwdif.c
> +++ b/libavfilter/vf_bwdif.c
> @@ -340,7 +340,14 @@ static int config_props(AVFilterLink *link)
>
>      yadif->csp = av_pix_fmt_desc_get(link->format);
>      yadif->filter = filter;
> -    if (yadif->csp->comp[0].depth > 8) {
> +    ff_bwdif_init_filter_line(s, yadif->csp->comp[0].depth);
> +
> +    return 0;
> +}
> +
> +av_cold void ff_bwdif_init_filter_line(BWDIFContext *s, int bit_depth)
> +{
> +    if (bit_depth > 8) {
>          s->filter_intra = filter_intra_16bit;
>          s->filter_line  = filter_line_c_16bit;
>          s->filter_edge  = filter_edge_16bit;
> @@ -351,10 +358,8 @@ static int config_props(AVFilterLink *link)
>      }
>
>  #if ARCH_X86
> -    ff_bwdif_init_x86(s);
> +    ff_bwdif_init_x86(s, bit_depth);
>  #endif
> -
> -    return 0;
>  }
>
>
> diff --git a/libavfilter/x86/vf_bwdif_init.c
> b/libavfilter/x86/vf_bwdif_init.c
> index e24e5cd9b1..ba7bc40c3d 100644
> --- a/libavfilter/x86/vf_bwdif_init.c
> +++ b/libavfilter/x86/vf_bwdif_init.c
> @@ -42,11 +42,9 @@ void ff_bwdif_filter_line_12bit_ssse3(void *dst, void
> *prev, void *cur, void *ne
>                                        int mrefs2, int prefs3, int mrefs3,
> int prefs4,
>                                        int mrefs4, int parity, int
> clip_max);
>
> -av_cold void ff_bwdif_init_x86(BWDIFContext *bwdif)
> +av_cold void ff_bwdif_init_x86(BWDIFContext *bwdif, int bit_depth)
>  {
> -    YADIFContext *yadif = &bwdif->yadif;
>      int cpu_flags = av_get_cpu_flags();
> -    int bit_depth = (!yadif->csp) ? 8 : yadif->csp->comp[0].depth;
>
>      if (bit_depth <= 8) {
>          if (EXTERNAL_SSE2(cpu_flags))
> --
> 2.39.1
>

I'm travelling at the moment and can only look at your patch set on my
phone. At first glance it looks good. If you are not in a hurry, I would
test it in two to three weeks when I am back home and have time.

Best Regards,
Thomas

>