From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id A5D784B550 for ; Wed, 21 May 2025 12:50:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 8A55E68D4B8; Wed, 21 May 2025 15:48:45 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 99C2368D20E for ; Wed, 21 May 2025 15:48:32 +0300 (EEST) Received: from haasn.dev (unknown [10.30.1.1]) by haasn.dev (Postfix) with UTF8SMTP id DE385481DB; Wed, 21 May 2025 14:48:28 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 May 2025 14:44:03 +0200 Message-ID: <20250521124824.49657-18-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250521124824.49657-1-ffmpeg@haasn.xyz> References: <20250521124824.49657-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 17/17] swscale/graph: allow experimental use of new format handler 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 \o/ --- libswscale/graph.c | 84 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 2 deletions(-) diff --git a/libswscale/graph.c b/libswscale/graph.c index dc7784aa49..24930e7627 100644 --- a/libswscale/graph.c +++ b/libswscale/graph.c @@ -34,6 +34,7 @@ #include "lut3d.h" #include "swscale_internal.h" #include "graph.h" +#include "ops.h" static int pass_alloc_output(SwsPass *pass) { @@ -453,6 +454,85 @@ static int add_legacy_sws_pass(SwsGraph *graph, SwsFormat src, SwsFormat dst, return 0; } +/********************* + * Format conversion * + *********************/ + +static int add_convert_pass(SwsGraph *graph, SwsFormat src, SwsFormat dst, + SwsPass *input, SwsPass **output) +{ + const SwsPixelType type = SWS_PIXEL_F32; + + SwsContext *ctx = graph->ctx; + SwsOpList *ops = NULL; + int ret = AVERROR(ENOTSUP); + + /* Mark the entire new ops infrastructure as experimental for now */ + if (!(ctx->flags & SWS_UNSTABLE)) + goto fail; + + /* The new format conversion layer cannot scale for now */ + if (src.width != dst.width || src.height != dst.height || + src.desc->log2_chroma_h || src.desc->log2_chroma_w || + dst.desc->log2_chroma_h || dst.desc->log2_chroma_w) + goto fail; + + /* The new code does not yet support alpha blending */ + if (src.desc->flags & AV_PIX_FMT_FLAG_ALPHA && + ctx->alpha_blend != SWS_ALPHA_BLEND_NONE) + goto fail; + + ops = ff_sws_op_list_alloc(); + if (!ops) + return AVERROR(ENOMEM); + ops->src = src; + ops->dst = dst; + + ret = ff_sws_decode_pixfmt(ops, src.format); + if (ret < 0) + goto fail; + ret = ff_sws_decode_colors(ctx, type, ops, src, &graph->incomplete); + if (ret < 0) + goto fail; + ret = ff_sws_encode_colors(ctx, type, ops, dst, &graph->incomplete); + if (ret < 0) + goto fail; + ret = ff_sws_encode_pixfmt(ops, dst.format); + if (ret < 0) + goto fail; + + av_log(ctx, AV_LOG_VERBOSE, "Conversion pass for %s -> %s:\n", + av_get_pix_fmt_name(src.format), av_get_pix_fmt_name(dst.format)); + + av_log(ctx, AV_LOG_DEBUG, "Unoptimized operation list:\n"); + ff_sws_op_list_print(ctx, AV_LOG_DEBUG, ops); + av_log(ctx, AV_LOG_DEBUG, "Optimized operation list:\n"); + + ff_sws_op_list_optimize(ops); + if (ops->num_ops == 0) { + av_log(ctx, AV_LOG_VERBOSE, " optimized into memcpy\n"); + ff_sws_op_list_free(&ops); + *output = input; + return 0; + } + + ff_sws_op_list_print(ctx, AV_LOG_VERBOSE, ops); + + ret = ff_sws_compile_pass(graph, ops, 0, dst, input, output); + if (ret < 0) + goto fail; + + ret = 0; + /* fall through */ + +fail: + ff_sws_op_list_free(&ops); + if (ret == AVERROR(ENOTSUP)) + return add_legacy_sws_pass(graph, src, dst, input, output); + return ret; +} + + /************************** * Gamut and tone mapping * **************************/ @@ -522,7 +602,7 @@ static int adapt_colors(SwsGraph *graph, SwsFormat src, SwsFormat dst, if (fmt_in != src.format) { SwsFormat tmp = src; tmp.format = fmt_in; - ret = add_legacy_sws_pass(graph, src, tmp, input, &input); + ret = add_convert_pass(graph, src, tmp, input, &input); if (ret < 0) return ret; } @@ -564,7 +644,7 @@ static int init_passes(SwsGraph *graph) src.color = dst.color; if (!ff_fmt_equal(&src, &dst)) { - ret = add_legacy_sws_pass(graph, src, dst, pass, &pass); + ret = add_convert_pass(graph, src, dst, pass, &pass); if (ret < 0) return ret; } -- 2.49.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".