From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id A15FD48D0E for ; Wed, 19 Feb 2025 20:47:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4088E68C477; Wed, 19 Feb 2025 22:46:13 +0200 (EET) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 62ED868C3B7 for ; Wed, 19 Feb 2025 22:45:59 +0200 (EET) Received: from haasn.dev (unknown [10.30.1.1]) by haasn.dev (Postfix) with ESMTP id 9EC8D434B3; Wed, 19 Feb 2025 21:45:55 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Feb 2025 21:45:46 +0100 Message-ID: <20250219204550.2826561-10-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250219204550.2826561-1-ffmpeg@haasn.xyz> References: <20250219204550.2826561-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/12] avfilter/vf_overlay: respect alpha mode tagging by default X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Niklas Haas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Niklas Haas --- doc/filters.texi | 3 +- libavfilter/vf_overlay.c | 199 ++++++++++++++++-------------- libavfilter/vf_overlay.h | 4 +- libavfilter/x86/vf_overlay_init.c | 8 +- 4 files changed, 116 insertions(+), 98 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index f281053965..fa23c10b2d 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -18823,7 +18823,8 @@ See @ref{framesync}. @item alpha Set format of alpha of the overlaid video, it can be @var{straight} or -@var{premultiplied}. Default is @var{straight}. +@var{premultiplied}, or @var{auto} to use the frame tagging if available. +Default is @var{auto}. @end table The @option{x}, and @option{y} expressions can contain the following diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index 528b845c6c..ee3538ef1d 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -761,117 +761,127 @@ static int config_input_main(AVFilterLink *inlink) s->main_is_packed_rgb = ff_fill_rgba_map(s->main_rgba_map, inlink->format) >= 0; s->main_has_alpha = ff_fmt_is_in(inlink->format, alpha_pix_fmts); - switch (s->format) { - case OVERLAY_FORMAT_YUV420: - s->blend_slice = s->main_has_alpha ? blend_slice_yuva420 : blend_slice_yuv420; - break; - case OVERLAY_FORMAT_YUV420P10: - s->blend_slice = s->main_has_alpha ? blend_slice_yuva420p10 : blend_slice_yuv420p10; - break; - case OVERLAY_FORMAT_YUV422: - s->blend_slice = s->main_has_alpha ? blend_slice_yuva422 : blend_slice_yuv422; - break; - case OVERLAY_FORMAT_YUV422P10: - s->blend_slice = s->main_has_alpha ? blend_slice_yuva422p10 : blend_slice_yuv422p10; - break; - case OVERLAY_FORMAT_YUV444: - s->blend_slice = s->main_has_alpha ? blend_slice_yuva444 : blend_slice_yuv444; - break; - case OVERLAY_FORMAT_YUV444P10: - s->blend_slice = s->main_has_alpha ? blend_slice_yuva444p10 : blend_slice_yuv444p10; - break; - case OVERLAY_FORMAT_RGB: - s->blend_slice = s->main_has_alpha ? blend_slice_rgba : blend_slice_rgb; - break; - case OVERLAY_FORMAT_GBRP: - s->blend_slice = s->main_has_alpha ? blend_slice_gbrap : blend_slice_gbrp; - break; - case OVERLAY_FORMAT_AUTO: - switch (inlink->format) { - case AV_PIX_FMT_YUVA420P: - s->blend_slice = blend_slice_yuva420; + return 0; +} + +static int init_slice_fn(AVFilterContext *ctx, enum AVAlphaMode alpha_mode) +{ + OverlayContext *s = ctx->priv; + const AVFilterLink *inlink = ctx->inputs[0]; + + switch (alpha_mode) { + case AVALPHA_MODE_UNSPECIFIED: + case AVALPHA_MODE_STRAIGHT: + switch (s->format) { + case OVERLAY_FORMAT_YUV420: + s->blend_slice = s->main_has_alpha ? blend_slice_yuva420 : blend_slice_yuv420; break; - case AV_PIX_FMT_YUVA420P10: - s->blend_slice = blend_slice_yuva420p10; + case OVERLAY_FORMAT_YUV420P10: + s->blend_slice = s->main_has_alpha ? blend_slice_yuva420p10 : blend_slice_yuv420p10; break; - case AV_PIX_FMT_YUVA422P: - s->blend_slice = blend_slice_yuva422; + case OVERLAY_FORMAT_YUV422: + s->blend_slice = s->main_has_alpha ? blend_slice_yuva422 : blend_slice_yuv422; break; - case AV_PIX_FMT_YUVA422P10: - s->blend_slice = blend_slice_yuva422p10; + case OVERLAY_FORMAT_YUV422P10: + s->blend_slice = s->main_has_alpha ? blend_slice_yuva422p10 : blend_slice_yuv422p10; break; - case AV_PIX_FMT_YUVA444P: - s->blend_slice = blend_slice_yuva444; + case OVERLAY_FORMAT_YUV444: + s->blend_slice = s->main_has_alpha ? blend_slice_yuva444 : blend_slice_yuv444; break; - case AV_PIX_FMT_YUVA444P10: - s->blend_slice = blend_slice_yuva444p10; + case OVERLAY_FORMAT_YUV444P10: + s->blend_slice = s->main_has_alpha ? blend_slice_yuva444p10 : blend_slice_yuv444p10; break; - case AV_PIX_FMT_ARGB: - case AV_PIX_FMT_RGBA: - case AV_PIX_FMT_BGRA: - case AV_PIX_FMT_ABGR: - s->blend_slice = blend_slice_rgba; + case OVERLAY_FORMAT_RGB: + s->blend_slice = s->main_has_alpha ? blend_slice_rgba : blend_slice_rgb; break; - case AV_PIX_FMT_GBRAP: - s->blend_slice = blend_slice_gbrap; + case OVERLAY_FORMAT_GBRP: + s->blend_slice = s->main_has_alpha ? blend_slice_gbrap : blend_slice_gbrp; break; - default: - av_assert0(0); + case OVERLAY_FORMAT_AUTO: + switch (inlink->format) { + case AV_PIX_FMT_YUVA420P: + s->blend_slice = blend_slice_yuva420; + break; + case AV_PIX_FMT_YUVA420P10: + s->blend_slice = blend_slice_yuva420p10; + break; + case AV_PIX_FMT_YUVA422P: + s->blend_slice = blend_slice_yuva422; + break; + case AV_PIX_FMT_YUVA422P10: + s->blend_slice = blend_slice_yuva422p10; + break; + case AV_PIX_FMT_YUVA444P: + s->blend_slice = blend_slice_yuva444; + break; + case AV_PIX_FMT_YUVA444P10: + s->blend_slice = blend_slice_yuva444p10; + break; + case AV_PIX_FMT_ARGB: + case AV_PIX_FMT_RGBA: + case AV_PIX_FMT_BGRA: + case AV_PIX_FMT_ABGR: + s->blend_slice = blend_slice_rgba; + break; + case AV_PIX_FMT_GBRAP: + s->blend_slice = blend_slice_gbrap; + break; + default: + av_assert0(0); + break; + } break; } break; - } - - if (!s->alpha_format) - goto end; - switch (s->format) { - case OVERLAY_FORMAT_YUV420: - s->blend_slice = s->main_has_alpha ? blend_slice_yuva420_pm : blend_slice_yuv420_pm; - break; - case OVERLAY_FORMAT_YUV422: - s->blend_slice = s->main_has_alpha ? blend_slice_yuva422_pm : blend_slice_yuv422_pm; - break; - case OVERLAY_FORMAT_YUV444: - s->blend_slice = s->main_has_alpha ? blend_slice_yuva444_pm : blend_slice_yuv444_pm; - break; - case OVERLAY_FORMAT_RGB: - s->blend_slice = s->main_has_alpha ? blend_slice_rgba_pm : blend_slice_rgb_pm; - break; - case OVERLAY_FORMAT_GBRP: - s->blend_slice = s->main_has_alpha ? blend_slice_gbrap_pm : blend_slice_gbrp_pm; - break; - case OVERLAY_FORMAT_AUTO: - switch (inlink->format) { - case AV_PIX_FMT_YUVA420P: - s->blend_slice = blend_slice_yuva420_pm; + case AVALPHA_MODE_PREMULTIPLIED: + switch (s->format) { + case OVERLAY_FORMAT_YUV420: + s->blend_slice = s->main_has_alpha ? blend_slice_yuva420_pm : blend_slice_yuv420_pm; break; - case AV_PIX_FMT_YUVA422P: - s->blend_slice = blend_slice_yuva422_pm; + case OVERLAY_FORMAT_YUV422: + s->blend_slice = s->main_has_alpha ? blend_slice_yuva422_pm : blend_slice_yuv422_pm; break; - case AV_PIX_FMT_YUVA444P: - s->blend_slice = blend_slice_yuva444_pm; + case OVERLAY_FORMAT_YUV444: + s->blend_slice = s->main_has_alpha ? blend_slice_yuva444_pm : blend_slice_yuv444_pm; break; - case AV_PIX_FMT_ARGB: - case AV_PIX_FMT_RGBA: - case AV_PIX_FMT_BGRA: - case AV_PIX_FMT_ABGR: - s->blend_slice = blend_slice_rgba_pm; + case OVERLAY_FORMAT_RGB: + s->blend_slice = s->main_has_alpha ? blend_slice_rgba_pm : blend_slice_rgb_pm; break; - case AV_PIX_FMT_GBRAP: - s->blend_slice = blend_slice_gbrap_pm; + case OVERLAY_FORMAT_GBRP: + s->blend_slice = s->main_has_alpha ? blend_slice_gbrap_pm : blend_slice_gbrp_pm; break; - default: - av_assert0(0); + case OVERLAY_FORMAT_AUTO: + switch (inlink->format) { + case AV_PIX_FMT_YUVA420P: + s->blend_slice = blend_slice_yuva420_pm; + break; + case AV_PIX_FMT_YUVA422P: + s->blend_slice = blend_slice_yuva422_pm; + break; + case AV_PIX_FMT_YUVA444P: + s->blend_slice = blend_slice_yuva444_pm; + break; + case AV_PIX_FMT_ARGB: + case AV_PIX_FMT_RGBA: + case AV_PIX_FMT_BGRA: + case AV_PIX_FMT_ABGR: + s->blend_slice = blend_slice_rgba_pm; + break; + case AV_PIX_FMT_GBRAP: + s->blend_slice = blend_slice_gbrap_pm; + break; + default: + av_assert0(0); + break; + } break; } break; } -end: #if ARCH_X86 - ff_overlay_init_x86(s, s->format, inlink->format, - s->alpha_format, s->main_has_alpha); + ff_overlay_init_x86(s, s->format, inlink->format, alpha_mode, s->main_has_alpha); #endif return 0; @@ -922,6 +932,11 @@ FF_ENABLE_DEPRECATION_WARNINGS s->y < mainpic->height && s->y + second->height >= 0) { ThreadData td; + enum AVAlphaMode alpha_mode = second->alpha_mode; + if (s->alpha_mode != AVALPHA_MODE_UNSPECIFIED) + alpha_mode = s->alpha_mode; + init_slice_fn(ctx, alpha_mode); + td.dst = mainpic; td.src = second; ff_filter_execute(ctx, s->blend_slice, &td, NULL, FFMIN(FFMAX(1, FFMIN3(s->y + second->height, FFMIN(second->height, mainpic->height), mainpic->height - s->y)), @@ -972,9 +987,11 @@ static const AVOption overlay_options[] = { { "gbrp", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_GBRP}, .flags = FLAGS, .unit = "format" }, { "auto", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_AUTO}, .flags = FLAGS, .unit = "format" }, { "repeatlast", "repeat overlay of the last overlay frame", OFFSET(fs.opt_repeatlast), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS }, - { "alpha", "alpha format", OFFSET(alpha_format), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, .unit = "alpha_format" }, - { "straight", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, .flags = FLAGS, .unit = "alpha_format" }, - { "premultiplied", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, .flags = FLAGS, .unit = "alpha_format" }, + { "alpha", "alpha format", OFFSET(alpha_mode), AV_OPT_TYPE_INT, {.i64=AVALPHA_MODE_UNSPECIFIED}, 0, AVALPHA_MODE_NB-1, FLAGS, .unit = "alpha_mode" }, + { "auto", "", 0, AV_OPT_TYPE_CONST, {.i64=AVALPHA_MODE_UNSPECIFIED}, .flags = FLAGS, .unit = "alpha_mode" }, + { "unknown", "", 0, AV_OPT_TYPE_CONST, {.i64=AVALPHA_MODE_UNSPECIFIED}, .flags = FLAGS, .unit = "alpha_mode" }, + { "straight", "", 0, AV_OPT_TYPE_CONST, {.i64=AVALPHA_MODE_STRAIGHT}, .flags = FLAGS, .unit = "alpha_mode" }, + { "premultiplied", "", 0, AV_OPT_TYPE_CONST, {.i64=AVALPHA_MODE_PREMULTIPLIED}, .flags = FLAGS, .unit = "alpha_mode" }, { NULL } }; diff --git a/libavfilter/vf_overlay.h b/libavfilter/vf_overlay.h index 59749648c3..c90c0fd46b 100644 --- a/libavfilter/vf_overlay.h +++ b/libavfilter/vf_overlay.h @@ -65,7 +65,7 @@ typedef struct OverlayContext { uint8_t overlay_rgba_map[4]; uint8_t overlay_has_alpha; int format; ///< OverlayFormat - int alpha_format; + int alpha_mode; int eval_mode; ///< EvalMode FFFrameSync fs; @@ -86,6 +86,6 @@ typedef struct OverlayContext { } OverlayContext; void ff_overlay_init_x86(OverlayContext *s, int format, int pix_format, - int alpha_format, int main_has_alpha); + enum AVAlphaMode, int main_has_alpha); #endif /* AVFILTER_OVERLAY_H */ diff --git a/libavfilter/x86/vf_overlay_init.c b/libavfilter/x86/vf_overlay_init.c index d4218b18f6..b698ee61a1 100644 --- a/libavfilter/x86/vf_overlay_init.c +++ b/libavfilter/x86/vf_overlay_init.c @@ -33,14 +33,14 @@ int ff_overlay_row_22_sse4(uint8_t *d, uint8_t *da, uint8_t *s, uint8_t *a, int w, ptrdiff_t alinesize); av_cold void ff_overlay_init_x86(OverlayContext *s, int format, int pix_format, - int alpha_format, int main_has_alpha) + enum AVAlphaMode alpha_mode, int main_has_alpha) { int cpu_flags = av_get_cpu_flags(); if (EXTERNAL_SSE4(cpu_flags) && (format == OVERLAY_FORMAT_YUV444 || format == OVERLAY_FORMAT_GBRP) && - alpha_format == 0 && main_has_alpha == 0) { + alpha_mode != AVALPHA_MODE_PREMULTIPLIED && main_has_alpha == 0) { s->blend_row[0] = ff_overlay_row_44_sse4; s->blend_row[1] = ff_overlay_row_44_sse4; s->blend_row[2] = ff_overlay_row_44_sse4; @@ -49,7 +49,7 @@ av_cold void ff_overlay_init_x86(OverlayContext *s, int format, int pix_format, if (EXTERNAL_SSE4(cpu_flags) && (pix_format == AV_PIX_FMT_YUV420P) && (format == OVERLAY_FORMAT_YUV420) && - alpha_format == 0 && main_has_alpha == 0) { + alpha_mode != AVALPHA_MODE_PREMULTIPLIED && main_has_alpha == 0) { s->blend_row[0] = ff_overlay_row_44_sse4; s->blend_row[1] = ff_overlay_row_20_sse4; s->blend_row[2] = ff_overlay_row_20_sse4; @@ -57,7 +57,7 @@ av_cold void ff_overlay_init_x86(OverlayContext *s, int format, int pix_format, if (EXTERNAL_SSE4(cpu_flags) && (format == OVERLAY_FORMAT_YUV422) && - alpha_format == 0 && main_has_alpha == 0) { + alpha_mode != AVALPHA_MODE_PREMULTIPLIED && main_has_alpha == 0) { s->blend_row[0] = ff_overlay_row_44_sse4; s->blend_row[1] = ff_overlay_row_22_sse4; s->blend_row[2] = ff_overlay_row_22_sse4; -- 2.47.0 _______________________________________________ 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".