From: Marton Balint <cus@passwd.hu>
To: ffmpeg-devel@ffmpeg.org
Cc: Marton Balint <cus@passwd.hu>
Subject: [FFmpeg-devel] [PATCH 2/4] avfilter/blend: put slice parameters to a single struct
Date: Thu, 9 May 2024 08:49:16 +0200
Message-ID: <20240509064918.6654-2-cus@passwd.hu> (raw)
In-Reply-To: <20240509064918.6654-1-cus@passwd.hu>
This should make future extensibility easier.
Signed-off-by: Marton Balint <cus@passwd.hu>
---
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)
--
2.35.3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2024-05-09 6:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-09 6:49 [FFmpeg-devel] [PATCH 1/4] avfilter/vsrc_testsrc: do not round down width and height for color src Marton Balint
2024-05-09 6:49 ` Marton Balint [this message]
2024-05-09 6:49 ` [FFmpeg-devel] [PATCH 3/4] avfilter/blend: use a per-thread AVExpr Marton Balint
2024-05-09 6:49 ` [FFmpeg-devel] [PATCH 4/4] avfilter/vf_geq: fix interpolation with 1 pixel width/height Marton Balint
2024-05-11 1:57 ` Michael Niedermayer
2024-05-13 19:43 ` Marton Balint
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240509064918.6654-2-cus@passwd.hu \
--to=cus@passwd.hu \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git