RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_tpad: accept hardware frames in clone-only mode 

When no drawing is to be performed, tpad can work fine with
hardware frames, so advertise this in the query_formats
callback and ensure the drawing context is never initialised
when just cloning frames.

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Reviewed-by: Niklas Haas <git@haasn.dev>
This commit is contained in:
Marvin Scholz 2023-05-22 12:14:33 +02:00 committed by Niklas Haas
parent fa7180b827
commit 86b252ea9d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/vf_tpad.c
View File

@ -71,7 +71,12 @@ AVFILTER_DEFINE_CLASS(tpad);
static int query_formats(AVFilterContext *ctx)
{
return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
TPadContext *s = ctx->priv;
if ((s->stop_mode == MODE_ADD && s->pad_stop != 0) ||
(s->start_mode == MODE_ADD && s->pad_start != 0))
return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
return ff_set_common_formats(ctx, ff_all_formats(AVMEDIA_TYPE_VIDEO));
}
static int activate(AVFilterContext *ctx)
@ -190,8 +195,11 @@ static int config_input(AVFilterLink *inlink)
AVFilterContext *ctx = inlink->dst;
TPadContext *s = ctx->priv;
ff_draw_init(&s->draw, inlink->format, 0);
ff_draw_color(&s->draw, &s->color, s->rgba_color);
if ((s->stop_mode == MODE_ADD && s->pad_stop != 0) ||
(s->start_mode == MODE_ADD && s->pad_start != 0)) {
ff_draw_init(&s->draw, inlink->format, 0);
ff_draw_color(&s->draw, &s->color, s->rgba_color);
}
if (s->start_duration)
s->pad_start = av_rescale_q(s->start_duration, inlink->frame_rate, av_inv_q(AV_TIME_BASE_Q));