virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avfilter/vf_libplacebo: switch to new background API

Browse Source 
Fixes a deprecation warning, and also fixes a bug where the depredated
skip_target_clearing option was not correctly mapped to the new API inside
libplacebo upstream.

Signed-off-by: Niklas Haas <git@haasn.dev>
Sponsored-by: nxtedition
This commit is contained in:
Niklas Haas
2025-02-19 18:20:11 +01:00
parent 05302767ac
commit 6602b88df6
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/vf_libplacebo.c
View File

@@ -892,8 +892,12 @@ static int output_frame(AVFilterContext *ctx, int64_t pts)
} }
/* Draw first frame opaque, others with blending */ /* Draw first frame opaque, others with blending */
opts->params.skip_target_clearing = false;
opts->params.blend_params = NULL; opts->params.blend_params = NULL;
#if PL_API_VER >= 346
opts->params.background = opts->params.border = PL_CLEAR_COLOR;
#else
opts->params.skip_target_clearing = false;
#endif
for (int i = 0; i < s->nb_inputs; i++) { for (int i = 0; i < s->nb_inputs; i++) {
LibplaceboInput *in = &s->inputs[i]; LibplaceboInput *in = &s->inputs[i];
FilterLink *il = ff_filter_link(ctx->inputs[in->idx]); FilterLink *il = ff_filter_link(ctx->inputs[in->idx]);
@@ -904,8 +908,12 @@ static int output_frame(AVFilterContext *ctx, int64_t pts)
opts->params.skip_caching_single_frame = high_fps; opts->params.skip_caching_single_frame = high_fps;
update_crops(ctx, in, &target, out->pts * av_q2d(outlink->time_base)); update_crops(ctx, in, &target, out->pts * av_q2d(outlink->time_base));
pl_render_image_mix(in->renderer, &in->mix, &target, &opts->params); pl_render_image_mix(in->renderer, &in->mix, &target, &opts->params);
opts->params.skip_target_clearing = true;
opts->params.blend_params = &pl_alpha_overlay; opts->params.blend_params = &pl_alpha_overlay;
#if PL_API_VER >= 346
opts->params.background = opts->params.border = PL_CLEAR_SKIP;
#else
opts->params.skip_target_clearing = true;
#endif
} }
if (outdesc->flags & AV_PIX_FMT_FLAG_HWACCEL) { if (outdesc->flags & AV_PIX_FMT_FLAG_HWACCEL) {