[FFmpeg-devel] [PATCH] avcodec/cfhd: prepare for SIMD addition

[James Almer]

On 8/9/2020 1:57 PM, Paul B Mahol wrote:
> Hi,
> 
> patch attached.

[...]

>  libavcodec/Makefile     |  2 +-
>  libavcodec/cfhd.c       | 60 +++++++++++-------------------------
>  libavcodec/cfhd.h       |  3 ++
>  libavcodec/cfhddsp.c    | 62 ++++++++++++++++++++++++++++++++++++++
>  libavcodec/cfhddsp.h    | 34 +++++++++++++++++++++
>  libavcodec/cfhdfilter.h | 67 +++++++++++++++++++++++++++++++++++++++++
>  6 files changed, 185 insertions(+), 43 deletions(-)
>  create mode 100644 libavcodec/cfhddsp.c
>  create mode 100644 libavcodec/cfhddsp.h
>  create mode 100644 libavcodec/cfhdfilter.h
> 
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index fc4294816e..26038e96d3 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -254,7 +254,7 @@ OBJS-$(CONFIG_CCAPTION_DECODER)        += ccaption_dec.o ass.o
>  OBJS-$(CONFIG_CDGRAPHICS_DECODER)      += cdgraphics.o
>  OBJS-$(CONFIG_CDTOONS_DECODER)         += cdtoons.o
>  OBJS-$(CONFIG_CDXL_DECODER)            += cdxl.o
> -OBJS-$(CONFIG_CFHD_DECODER)            += cfhd.o cfhddata.o
> +OBJS-$(CONFIG_CFHD_DECODER)            += cfhd.o cfhddata.o cfhddsp.o
>  OBJS-$(CONFIG_CFHD_ENCODER)            += cfhdenc.o cfhddata.o
>  OBJS-$(CONFIG_CINEPAK_DECODER)         += cinepak.o
>  OBJS-$(CONFIG_CINEPAK_ENCODER)         += cinepakenc.o elbg.o
> diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
> index 1d7f964e34..e0503c1fa1 100644
> --- a/libavcodec/cfhd.c
> +++ b/libavcodec/cfhd.c
> @@ -190,7 +190,7 @@ static inline void process_bayer(AVFrame *frame, int bpc)
>      }
>  }
>  
> -static inline void filter(int16_t *output, ptrdiff_t out_stride,
> +static av_always_inline void filter(int16_t *output, ptrdiff_t out_stride,

Shouldn't you remove this function and include cfhdfilter.h instead?

>                            int16_t *low, ptrdiff_t low_stride,
>                            int16_t *high, ptrdiff_t high_stride,