From a69a0b689c3c4e1e0bbf4c17716a25e14332a250 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Wed, 8 May 2024 23:05:27 +0200 Subject: [PATCH] avfilter/blend: put slice parameters to a single struct This should make future extensibility easier. Signed-off-by: Marton Balint --- libavfilter/blend.h | 7 ++++++- libavfilter/blend_modes.c | 2 +- libavfilter/vf_blend.c | 7 +++++-- libavfilter/vf_blend_init.h | 4 ++-- libavfilter/x86/vf_blend_init.c | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/libavfilter/blend.h b/libavfilter/blend.h index b046e062bc..52c1b777c2 100644 --- a/libavfilter/blend.h +++ b/libavfilter/blend.h @@ -69,6 +69,11 @@ enum BlendMode { BLEND_NB }; +typedef struct SliceParams { + double *values; + int starty; +} SliceParams; + typedef struct FilterParams { enum BlendMode mode; double opacity; @@ -78,7 +83,7 @@ typedef struct FilterParams { const uint8_t *bottom, ptrdiff_t bottom_linesize, uint8_t *dst, ptrdiff_t dst_linesize, ptrdiff_t width, ptrdiff_t height, - struct FilterParams *param, double *values, int starty); + struct FilterParams *param, SliceParams *sliceparam); } FilterParams; void ff_blend_init_x86(FilterParams *param, int depth); diff --git a/libavfilter/blend_modes.c b/libavfilter/blend_modes.c index 65c5e6f890..def5ae8e0d 100644 --- a/libavfilter/blend_modes.c +++ b/libavfilter/blend_modes.c @@ -91,7 +91,7 @@ static void fn0(NAME)(const uint8_t *_top, ptrdiff_t top_linesize, \ const uint8_t *_bottom, ptrdiff_t bottom_linesize, \ uint8_t *_dst, ptrdiff_t dst_linesize, \ ptrdiff_t width, ptrdiff_t height, \ - FilterParams *param, double *values, int starty) \ + FilterParams *param, SliceParams *sliceparam) \ { \ const PIXEL *top = (const PIXEL *)_top; \ const PIXEL *bottom = (const PIXEL *)_bottom; \ diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 6b52647966..9ee8901e45 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -132,10 +132,12 @@ static void blend_expr_## name(const uint8_t *_top, ptrdiff_t top_linesize, const uint8_t *_bottom, ptrdiff_t bottom_linesize, \ uint8_t *_dst, ptrdiff_t dst_linesize, \ ptrdiff_t width, ptrdiff_t height, \ - FilterParams *param, double *values, int starty) \ + FilterParams *param, SliceParams *sliceparam) \ { \ const type *top = (const type*)_top; \ const type *bottom = (const type*)_bottom; \ + double *values = sliceparam->values; \ + int starty = sliceparam->starty; \ type *dst = (type*)_dst; \ AVExpr *e = param->e; \ int y, x; \ @@ -171,6 +173,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) const uint8_t *bottom = td->bottom->data[td->plane]; uint8_t *dst = td->dst->data[td->plane]; double values[VAR_VARS_NB]; + SliceParams sliceparam = {.values = &values[0], .starty = slice_start}; values[VAR_N] = td->inlink->frame_count_out; values[VAR_T] = td->dst->pts == AV_NOPTS_VALUE ? NAN : td->dst->pts * av_q2d(td->inlink->time_base); @@ -185,7 +188,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) td->bottom->linesize[td->plane], dst + slice_start * td->dst->linesize[td->plane], td->dst->linesize[td->plane], - td->w, height, td->param, &values[0], slice_start); + td->w, height, td->param, &sliceparam); return 0; } diff --git a/libavfilter/vf_blend_init.h b/libavfilter/vf_blend_init.h index d24f178032..956e1cb9fc 100644 --- a/libavfilter/vf_blend_init.h +++ b/libavfilter/vf_blend_init.h @@ -58,7 +58,7 @@ static void blend_copy ## src##_##depth(const uint8_t *top, ptrdiff_t top_linesi const uint8_t *bottom, ptrdiff_t bottom_linesize,\ uint8_t *dst, ptrdiff_t dst_linesize, \ ptrdiff_t width, ptrdiff_t height, \ - FilterParams *param, double *values, int starty) \ + FilterParams *param, SliceParams *sliceparam) \ { \ av_image_copy_plane(dst, dst_linesize, src, src ## _linesize, \ width * depth / 8, height); \ @@ -80,7 +80,7 @@ static void blend_normal_##name(const uint8_t *_top, ptrdiff_t top_linesize, const uint8_t *_bottom, ptrdiff_t bottom_linesize,\ uint8_t *_dst, ptrdiff_t dst_linesize, \ ptrdiff_t width, ptrdiff_t height, \ - FilterParams *param, double *values, int starty) \ + FilterParams *param, SliceParams *sliceparam) \ { \ const type *top = (const type*)_top; \ const type *bottom = (const type*)_bottom; \ diff --git a/libavfilter/x86/vf_blend_init.c b/libavfilter/x86/vf_blend_init.c index c326c43362..f4e097ee3d 100644 --- a/libavfilter/x86/vf_blend_init.c +++ b/libavfilter/x86/vf_blend_init.c @@ -28,7 +28,7 @@ void ff_blend_##name##_##opt(const uint8_t *top, ptrdiff_t top_linesize, \ const uint8_t *bottom, ptrdiff_t bottom_linesize, \ uint8_t *dst, ptrdiff_t dst_linesize, \ ptrdiff_t width, ptrdiff_t height, \ - struct FilterParams *param, double *values, int starty); + FilterParams *param, SliceParams *sliceparam); BLEND_FUNC(addition, sse2) BLEND_FUNC(addition, avx2)