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 514194B987 for ; Sat, 26 Apr 2025 17:56:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD12D68B43D; Sat, 26 Apr 2025 20:56:19 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 043BB68A112 for ; Sat, 26 Apr 2025 20:56:11 +0300 (EEST) Received: from haasn.dev (unknown [10.30.1.1]) by haasn.dev (Postfix) with UTF8SMTP id B27344203D; Sat, 26 Apr 2025 19:56:10 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Apr 2025 19:41:06 +0200 Message-ID: <20250426175603.726924-3-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250426175603.726924-1-ffmpeg@haasn.xyz> References: <20250426175603.726924-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/17] swscale/graph: expose ff_sws_graph_add_pass 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 So we can move pass-adding business logic outside of graph.c. --- libswscale/graph.c | 41 ++++++++++++++++++++--------------------- libswscale/graph.h | 18 ++++++++++++++++++ 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/libswscale/graph.c b/libswscale/graph.c index cd56f51f88..6cfcf4f2c6 100644 --- a/libswscale/graph.c +++ b/libswscale/graph.c @@ -44,10 +44,9 @@ static int pass_alloc_output(SwsPass *pass) pass->num_slices * pass->slice_h, pass->format, 64); } -/* slice_align should be a power of two, or 0 to disable slice threading */ -static SwsPass *pass_add(SwsGraph *graph, void *priv, enum AVPixelFormat fmt, - int w, int h, SwsPass *input, int slice_align, - sws_filter_run_t run) +SwsPass *ff_sws_graph_add_pass(SwsGraph *graph, enum AVPixelFormat fmt, + int width, int height, SwsPass *input, + int align, void *priv, sws_filter_run_t run) { int ret; SwsPass *pass = av_mallocz(sizeof(*pass)); @@ -58,8 +57,8 @@ static SwsPass *pass_add(SwsGraph *graph, void *priv, enum AVPixelFormat fmt, pass->run = run; pass->priv = priv; pass->format = fmt; - pass->width = w; - pass->height = h; + pass->width = width; + pass->height = height; pass->input = input; pass->output.fmt = AV_PIX_FMT_NONE; @@ -69,12 +68,12 @@ static SwsPass *pass_add(SwsGraph *graph, void *priv, enum AVPixelFormat fmt, return NULL; } - if (!slice_align) { + if (!align) { pass->slice_h = pass->height; pass->num_slices = 1; } else { pass->slice_h = (pass->height + graph->num_threads - 1) / graph->num_threads; - pass->slice_h = FFALIGN(pass->slice_h, slice_align); + pass->slice_h = FFALIGN(pass->slice_h, align); pass->num_slices = (pass->height + pass->slice_h - 1) / pass->slice_h; } @@ -84,12 +83,11 @@ static SwsPass *pass_add(SwsGraph *graph, void *priv, enum AVPixelFormat fmt, return pass; } -/* Wrapper around pass_add that chains a pass "in-place" */ -static int pass_append(SwsGraph *graph, void *priv, enum AVPixelFormat fmt, - int w, int h, SwsPass **pass, int slice_align, - sws_filter_run_t run) +/* Wrapper around ff_sws_graph_add_pass() that chains a pass "in-place" */ +static int pass_append(SwsGraph *graph, enum AVPixelFormat fmt, int w, int h, + SwsPass **pass, int align, void *priv, sws_filter_run_t run) { - SwsPass *new = pass_add(graph, priv, fmt, w, h, *pass, slice_align, run); + SwsPass *new = ff_sws_graph_add_pass(graph, fmt, w, h, *pass, align, priv, run); if (!new) return AVERROR(ENOMEM); *pass = new; @@ -325,19 +323,19 @@ static int init_legacy_subpass(SwsGraph *graph, SwsContext *sws, align = 0; /* disable slice threading */ if (c->src0Alpha && !c->dst0Alpha && isALPHA(sws->dst_format)) { - ret = pass_append(graph, c, AV_PIX_FMT_RGBA, src_w, src_h, &input, 1, run_rgb0); + ret = pass_append(graph, AV_PIX_FMT_RGBA, src_w, src_h, &input, 1, c, run_rgb0); if (ret < 0) return ret; } if (c->srcXYZ && !(c->dstXYZ && unscaled)) { - ret = pass_append(graph, c, AV_PIX_FMT_RGB48, src_w, src_h, &input, 1, run_xyz2rgb); + ret = pass_append(graph, AV_PIX_FMT_RGB48, src_w, src_h, &input, 1, c, run_xyz2rgb); if (ret < 0) return ret; } - pass = pass_add(graph, sws, sws->dst_format, dst_w, dst_h, input, align, - c->convert_unscaled ? run_legacy_unscaled : run_legacy_swscale); + pass = ff_sws_graph_add_pass(graph, sws->dst_format, dst_w, dst_h, input, align, sws, + c->convert_unscaled ? run_legacy_unscaled : run_legacy_swscale); if (!pass) return AVERROR(ENOMEM); pass->setup = setup_legacy_swscale; @@ -387,7 +385,7 @@ static int init_legacy_subpass(SwsGraph *graph, SwsContext *sws, } if (c->dstXYZ && !(c->srcXYZ && unscaled)) { - ret = pass_append(graph, c, AV_PIX_FMT_RGB48, dst_w, dst_h, &pass, 1, run_rgb2xyz); + ret = pass_append(graph, AV_PIX_FMT_RGB48, dst_w, dst_h, &pass, 1, c, run_rgb2xyz); if (ret < 0) return ret; } @@ -548,8 +546,8 @@ static int adapt_colors(SwsGraph *graph, SwsFormat src, SwsFormat dst, return ret; } - pass = pass_add(graph, lut, fmt_out, src.width, src.height, - input, 1, run_lut3d); + pass = ff_sws_graph_add_pass(graph, fmt_out, src.width, src.height, + input, 1, lut, run_lut3d); if (!pass) { ff_sws_lut3d_free(&lut); return AVERROR(ENOMEM); @@ -589,7 +587,8 @@ static int init_passes(SwsGraph *graph) graph->noop = 1; /* Add threaded memcpy pass */ - pass = pass_add(graph, NULL, dst.format, dst.width, dst.height, pass, 1, run_copy); + pass = ff_sws_graph_add_pass(graph, dst.format, dst.width, dst.height, + pass, 1, NULL, run_copy); if (!pass) return AVERROR(ENOMEM); } diff --git a/libswscale/graph.h b/libswscale/graph.h index b42d54be04..62b622a065 100644 --- a/libswscale/graph.h +++ b/libswscale/graph.h @@ -128,6 +128,24 @@ typedef struct SwsGraph { int ff_sws_graph_create(SwsContext *ctx, const SwsFormat *dst, const SwsFormat *src, int field, SwsGraph **out_graph); + +/** + * Allocate and add a new pass to the filter graph. + * + * @param graph Filter graph to add the pass to. + * @param fmt Pixel format of the output image. + * @param w Width of the output image. + * @param h Height of the output image. + * @param input Previous pass to read from, or NULL for the input image. + * @param align Minimum slice alignment for this pass, or 0 for no threading. + * @param priv Private state for the filter run function. + * @param run Filter function to run. + * @return The newly created pass, or NULL on error. + */ +SwsPass *ff_sws_graph_add_pass(SwsGraph *graph, enum AVPixelFormat fmt, + int width, int height, SwsPass *input, + int align, void *priv, sws_filter_run_t run); + /** * Uninitialize any state associate with this filter graph and free it. */ -- 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".