har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_tpad: fix check for drawing initialization

Browse Source 
The check if drawing needs to be initialized and supported formats
should be drawable ones was flawed, as pad_stop/pad_start is only
populated from stop_duration/start_duration after these checks.

To fix that, check the _duration variants as well and for better
readability and maintainability break the check out into its own
helper.

Fixes a regression from 86b252ea9dee18006910e30646ad1067f2d1323f
Fix #10621

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 6667741029bce9a79b48caedf24d6cb69c5ead7d)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Marvin Scholz 2023-11-07 23:21:17 +01:00 committed by Anton Khirnov
parent 3d7c02e4a2
commit c5ee01d966
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/vf_tpad.c
View File

@ -70,11 +70,17 @@ static const AVOption tpad_options[] = {
AVFILTER_DEFINE_CLASS(tpad);
static int needs_drawing(const TPadContext *s) {
return (
(s->stop_mode == MODE_ADD && (s->pad_stop != 0 || s->stop_duration != 0)) ||
(s->start_mode == MODE_ADD && (s->pad_start != 0 || s->start_duration != 0))
);
}
static int query_formats(AVFilterContext *ctx)
{
TPadContext *s = ctx->priv;
if ((s->stop_mode == MODE_ADD && s->pad_stop != 0) ||
(s->start_mode == MODE_ADD && s->pad_start != 0))
if (needs_drawing(s))
return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
return ff_set_common_formats(ctx, ff_all_formats(AVMEDIA_TYPE_VIDEO));
@ -196,8 +202,7 @@ static int config_input(AVFilterLink *inlink)
AVFilterContext *ctx = inlink->dst;
TPadContext *s = ctx->priv;
if ((s->stop_mode == MODE_ADD && s->pad_stop != 0) ||
(s->start_mode == MODE_ADD && s->pad_start != 0)) {
if (needs_drawing(s)) {
ff_draw_init(&s->draw, inlink->format, 0);
ff_draw_color(&s->draw, &s->color, s->rgba_color);
}