* [FFmpeg-devel] [PATCH] lavfi/overlay: factorize definition of planar and package blending functions
@ 2023-12-16 14:24 Stefano Sabatini
2023-12-24 17:40 ` Stefano Sabatini
0 siblings, 1 reply; 5+ messages in thread
From: Stefano Sabatini @ 2023-12-16 14:24 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Stefano Sabatini
---
libavfilter/vf_overlay.c | 260 ++++++++-------------------------------
1 file changed, 53 insertions(+), 207 deletions(-)
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index fa39abb23a..caf0634b51 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -690,213 +690,59 @@ static av_always_inline void blend_slice_planar_rgb(AVFilterContext *ctx,
alpha_composite_8_8bits(src, dst, src_w, src_h, dst_w, dst_h, x, y, jobnr, nb_jobs);
}
-static int blend_slice_yuv420(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_8_8bits(ctx, td->dst, td->src, 1, 1, 0, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuva420(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_8_8bits(ctx, td->dst, td->src, 1, 1, 1, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuv420p10(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_16_10bits(ctx, td->dst, td->src, 1, 1, 0, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuva420p10(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_16_10bits(ctx, td->dst, td->src, 1, 1, 1, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuv422p10(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_16_10bits(ctx, td->dst, td->src, 1, 0, 0, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuva422p10(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_16_10bits(ctx, td->dst, td->src, 1, 0, 1, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuv422(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_8_8bits(ctx, td->dst, td->src, 1, 0, 0, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuva422(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_8_8bits(ctx, td->dst, td->src, 1, 0, 1, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuv444(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_8_8bits(ctx, td->dst, td->src, 0, 0, 0, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuva444(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_8_8bits(ctx, td->dst, td->src, 0, 0, 1, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuv444p10(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_16_10bits(ctx, td->dst, td->src, 0, 0, 0, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuva444p10(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_16_10bits(ctx, td->dst, td->src, 0, 0, 1, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_gbrp(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_planar_rgb(ctx, td->dst, td->src, 0, 0, 0, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_gbrap(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_planar_rgb(ctx, td->dst, td->src, 0, 0, 1, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuv420_pm(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_8_8bits(ctx, td->dst, td->src, 1, 1, 0, s->x, s->y, 0, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuva420_pm(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_8_8bits(ctx, td->dst, td->src, 1, 1, 1, s->x, s->y, 0, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuv422_pm(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_8_8bits(ctx, td->dst, td->src, 1, 0, 0, s->x, s->y, 0, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuva422_pm(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_8_8bits(ctx, td->dst, td->src, 1, 0, 1, s->x, s->y, 0, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuv444_pm(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_8_8bits(ctx, td->dst, td->src, 0, 0, 0, s->x, s->y, 0, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_yuva444_pm(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_yuv_8_8bits(ctx, td->dst, td->src, 0, 0, 1, s->x, s->y, 0, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_gbrp_pm(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_planar_rgb(ctx, td->dst, td->src, 0, 0, 0, s->x, s->y, 0, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_gbrap_pm(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_planar_rgb(ctx, td->dst, td->src, 0, 0, 1, s->x, s->y, 0, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_rgb(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_packed_rgb(ctx, td->dst, td->src, 0, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_rgba(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_packed_rgb(ctx, td->dst, td->src, 1, s->x, s->y, 1, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_rgb_pm(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_packed_rgb(ctx, td->dst, td->src, 0, s->x, s->y, 0, jobnr, nb_jobs);
- return 0;
-}
-
-static int blend_slice_rgba_pm(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-{
- OverlayContext *s = ctx->priv;
- ThreadData *td = arg;
- blend_slice_packed_rgb(ctx, td->dst, td->src, 1, s->x, s->y, 0, jobnr, nb_jobs);
- return 0;
-}
+#define DEFINE_BLEND_SLICE_PLANAR_FMT(format_, blend_slice_fn_suffix_, hsub_, vsub_, main_has_alpha_, direct_) \
+static int blend_slice_##format_(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) \
+{ \
+ OverlayContext *s = ctx->priv; \
+ ThreadData *td = arg; \
+ blend_slice_##blend_slice_fn_suffix_(ctx, td->dst, td->src, \
+ hsub_, vsub_, main_has_alpha_, \
+ s->x, s->y, direct_, \
+ jobnr, nb_jobs); \
+ return 0; \
+}
+
+// FMT FN H V A D
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuv420, yuv_8_8bits, 1, 1, 0, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuva420, yuv_8_8bits, 1, 1, 1, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuv420p10, yuv_16_10bits, 1, 1, 0, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuva420p10, yuv_16_10bits, 1, 1, 1, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuv422p10, yuv_16_10bits, 1, 0, 0, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuva422p10, yuv_16_10bits, 1, 0, 1, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuv422, yuv_8_8bits, 1, 0, 0, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuva422, yuv_8_8bits, 1, 0, 1, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuv444, yuv_8_8bits, 0, 0, 0, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuva444, yuv_8_8bits, 0, 0, 1, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuv444p10, yuv_16_10bits, 0, 0, 0, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuva444p10, yuv_16_10bits, 0, 0, 1, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(gbrp, planar_rgb, 0, 0, 0, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(gbrap, planar_rgb, 0, 0, 1, 1);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuv420_pm, yuv_8_8bits, 1, 1, 0, 0);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuva420_pm, yuv_8_8bits, 1, 1, 1, 0);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuv422_pm, yuv_8_8bits, 1, 0, 0, 0);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuva422_pm, yuv_8_8bits, 1, 0, 1, 0);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuv444_pm, yuv_8_8bits, 0, 0, 0, 0);
+DEFINE_BLEND_SLICE_PLANAR_FMT(yuva444_pm, yuv_8_8bits, 0, 0, 1, 0);
+DEFINE_BLEND_SLICE_PLANAR_FMT(gbrp_pm, planar_rgb, 0, 0, 0, 0);
+DEFINE_BLEND_SLICE_PLANAR_FMT(gbrap_pm, planar_rgb, 0, 0, 1, 0);
+
+#define DEFINE_BLEND_SLICE_PACKED_FMT(format_, blend_slice_fn_suffix_, main_has_alpha_, direct_) \
+static int blend_slice_##format_(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) \
+{ \
+ OverlayContext *s = ctx->priv; \
+ ThreadData *td = arg; \
+ blend_slice_packed_##blend_slice_fn_suffix_(ctx, td->dst, td->src, \
+ main_has_alpha_, \
+ s->x, s->y, direct_, \
+ jobnr, nb_jobs); \
+ return 0; \
+}
+
+// FMT FN A D
+DEFINE_BLEND_SLICE_PACKED_FMT(rgb, rgb, 0, 1);
+DEFINE_BLEND_SLICE_PACKED_FMT(rgba, rgb, 1, 1);
+DEFINE_BLEND_SLICE_PACKED_FMT(rgb_pm, rgb, 0, 0);
+DEFINE_BLEND_SLICE_PACKED_FMT(rgba_pm, rgb, 1, 0);
static int config_input_main(AVFilterLink *inlink)
{
--
2.34.1
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH] lavfi/overlay: factorize definition of planar and package blending functions
2023-12-16 14:24 [FFmpeg-devel] [PATCH] lavfi/overlay: factorize definition of planar and package blending functions Stefano Sabatini
@ 2023-12-24 17:40 ` Stefano Sabatini
2023-12-24 17:54 ` Dennis Mungai
2024-01-02 21:11 ` Stefano Sabatini
0 siblings, 2 replies; 5+ messages in thread
From: Stefano Sabatini @ 2023-12-24 17:40 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On date Saturday 2023-12-16 15:24:36 +0100, Stefano Sabatini wrote:
> ---
> libavfilter/vf_overlay.c | 260 ++++++++-------------------------------
> 1 file changed, 53 insertions(+), 207 deletions(-)
Will apply in a few days.
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH] lavfi/overlay: factorize definition of planar and package blending functions
2023-12-24 17:40 ` Stefano Sabatini
@ 2023-12-24 17:54 ` Dennis Mungai
2023-12-27 13:04 ` Stefano Sabatini
2024-01-02 21:11 ` Stefano Sabatini
1 sibling, 1 reply; 5+ messages in thread
From: Dennis Mungai @ 2023-12-24 17:54 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Sun, 24 Dec 2023, 20:41 Stefano Sabatini, <stefasab@gmail.com> wrote:
> On date Saturday 2023-12-16 15:24:36 +0100, Stefano Sabatini wrote:
> > ---
> > libavfilter/vf_overlay.c | 260 ++++++++-------------------------------
> > 1 file changed, 53 insertions(+), 207 deletions(-)
>
> Will apply in a few days.
>
Hello,
Is a similar change required in the other overlay filter applications, such
as overlay_cuda, overlay_vulkan, etc?
>
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH] lavfi/overlay: factorize definition of planar and package blending functions
2023-12-24 17:54 ` Dennis Mungai
@ 2023-12-27 13:04 ` Stefano Sabatini
0 siblings, 0 replies; 5+ messages in thread
From: Stefano Sabatini @ 2023-12-27 13:04 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On date Sunday 2023-12-24 20:54:39 +0300, Dennis Mungai wrote:
> On Sun, 24 Dec 2023, 20:41 Stefano Sabatini, <stefasab@gmail.com> wrote:
>
> > On date Saturday 2023-12-16 15:24:36 +0100, Stefano Sabatini wrote:
> > > ---
> > > libavfilter/vf_overlay.c | 260 ++++++++-------------------------------
> > > 1 file changed, 53 insertions(+), 207 deletions(-)
> >
> > Will apply in a few days.
> >
>
>
> Hello,
>
> Is a similar change required in the other overlay filter applications, such
> as overlay_cuda, overlay_vulkan, etc?
Checked the code, this is the only one benefitting from this kind of
refactoring.
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH] lavfi/overlay: factorize definition of planar and package blending functions
2023-12-24 17:40 ` Stefano Sabatini
2023-12-24 17:54 ` Dennis Mungai
@ 2024-01-02 21:11 ` Stefano Sabatini
1 sibling, 0 replies; 5+ messages in thread
From: Stefano Sabatini @ 2024-01-02 21:11 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On date Sunday 2023-12-24 18:40:56 +0100, Stefano Sabatini wrote:
> On date Saturday 2023-12-16 15:24:36 +0100, Stefano Sabatini wrote:
> > ---
> > libavfilter/vf_overlay.c | 260 ++++++++-------------------------------
> > 1 file changed, 53 insertions(+), 207 deletions(-)
>
> Will apply in a few days.
Applied.
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-01-02 21:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-16 14:24 [FFmpeg-devel] [PATCH] lavfi/overlay: factorize definition of planar and package blending functions Stefano Sabatini
2023-12-24 17:40 ` Stefano Sabatini
2023-12-24 17:54 ` Dennis Mungai
2023-12-27 13:04 ` Stefano Sabatini
2024-01-02 21:11 ` Stefano Sabatini
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