This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit dda8b8253cb020d0a09942e6507505ab608128b3 Author: Timo Rothenpieler <[email protected]> AuthorDate: Fri Aug 14 23:13:16 2026 +0200 Commit: Timo Rothenpieler <[email protected]> CommitDate: Thu Aug 20 12:09:22 2026 +0000 avfilter/vf_scale_cuda: extract pass determination into its own function --- libavfilter/vf_scale_cuda.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_scale_cuda.c b/libavfilter/vf_scale_cuda.c index 2c22ec1aa4..fc3a91d299 100644 --- a/libavfilter/vf_scale_cuda.c +++ b/libavfilter/vf_scale_cuda.c @@ -369,6 +369,27 @@ static av_cold void set_format_info(AVFilterContext *ctx, enum AVPixelFormat in_ } } +static av_cold void cudascale_setup_passes(AVFilterContext *ctx) +{ + CUDAScaleContext *s = ctx->priv; + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; + + s->pass_x = s->pass_y = -1; + if (!s->use_filters) + return; + + if (inlink->w != outlink->w && inlink->h != outlink->h) { + /* Always perform the horizontal scaling pass first */ + s->pass_x = FILTER_TMP; + s->pass_y = FILTER_OUT; + } else if (inlink->w != outlink->w) { + s->pass_x = FILTER_OUT; + } else if (inlink->h != outlink->h) { + s->pass_y = FILTER_OUT; + } +} + static av_cold int init_processing_chain(AVFilterContext *ctx, int in_width, int in_height, int out_width, int out_height) { @@ -433,6 +454,8 @@ static av_cold int init_processing_chain(AVFilterContext *ctx, int in_width, int if (!outl->hw_frames_ctx) return AVERROR(ENOMEM); + cudascale_setup_passes(ctx); + return 0; } @@ -624,17 +647,6 @@ static av_cold int cudascale_setup_filters(AVFilterContext *ctx) if (ret < 0) return ret; - s->pass_x = s->pass_y = -1; - if (inlink->w != outlink->w && inlink->h != outlink->h) { - /* Always perform the horizontal scaling pass first */ - s->pass_x = FILTER_TMP; - s->pass_y = FILTER_OUT; - } else if (inlink->w != outlink->w) { - s->pass_x = FILTER_OUT; - } else if (inlink->h != outlink->h) { - s->pass_y = FILTER_OUT; - } - if (s->pass_x >= 0) { ret = cudascale_filter_init(ctx, &s->filters[s->pass_x], inlink->w, outlink->w, 0.0); -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
