virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-09-16 08:36:51 +02:00
Code Issues Releases Activity

avfilter: use ff_draw_init_from_link() where possible

Browse Source
This commit is contained in:
Niklas Haas
2025-08-13 15:43:35 +02:00
parent eddbdc8b7c
commit a90e8f1c1d
12 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/qrencode.c
View File

@@ -645,7 +645,7 @@ static int qrencodesrc_config_props(AVFilterLink *outlink)
ff_draw_color(&qr->draw, &qr->draw_foreground_color, (const uint8_t *)&qr->foreground_color);
ff_draw_color(&qr->draw, &qr->draw_background_color, (const uint8_t *)&qr->background_color);
ret = ff_draw_init2(&qr->draw0, outlink->format, outlink->colorspace, outlink->color_range, FF_DRAW_PROCESS_ALPHA);
ret = ff_draw_init_from_link(&qr->draw0, outlink, FF_DRAW_PROCESS_ALPHA);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialize FFDrawContext\n");
return ret;
@@ -743,8 +743,7 @@ static int qrencode_config_input(AVFilterLink *inlink)
qr->is_source = 0;
ret = ff_draw_init2(&qr->draw, inlink->format, inlink->colorspace, inlink->color_range,
FF_DRAW_PROCESS_ALPHA);
ret = ff_draw_init_from_link(&qr->draw, inlink, FF_DRAW_PROCESS_ALPHA);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialize FFDrawContext\n");
return ret;
@@ -777,8 +776,7 @@ static int qrencode_config_input(AVFilterLink *inlink)
PARSE_EXPR(rendered_qrcode_width);
PARSE_EXPR(rendered_padded_qrcode_width);
ret = ff_draw_init2(&qr->draw, inlink->format, inlink->colorspace, inlink->color_range,
FF_DRAW_PROCESS_ALPHA);
ret = ff_draw_init_from_link(&qr->draw, inlink, FF_DRAW_PROCESS_ALPHA);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialize FFDrawContext\n");
return ret;

2
libavfilter/src_avsynctest.c
View File

@@ -161,7 +161,7 @@ static av_cold int config_props(AVFilterLink *outlink)
s->dir = 1;
s->prev_intpart = INT64_MIN;
ret = ff_draw_init2(&s->draw, outlink->format, outlink->colorspace, outlink->color_range, 0);
ret = ff_draw_init_from_link(&s->draw, outlink, 0);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialize FFDrawContext\n");
return ret;

2
libavfilter/vf_datascope.c
View File

@@ -390,7 +390,7 @@ static int config_input(AVFilterLink *inlink)
int ret;
s->nb_planes = av_pix_fmt_count_planes(inlink->format);
ret = ff_draw_init2(&s->draw, inlink->format, inlink->colorspace, inlink->color_range, 0);
ret = ff_draw_init_from_link(&s->draw, inlink, 0);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialize FFDrawContext\n");
return ret;

2
libavfilter/vf_drawtext.c
View File

@@ -1144,7 +1144,7 @@ static int config_input(AVFilterLink *inlink)
char *expr;
int ret;
ret = ff_draw_init2(&s->dc, inlink->format, inlink->colorspace, inlink->color_range, FF_DRAW_PROCESS_ALPHA);
ret = ff_draw_init_from_link(&s->dc, inlink, FF_DRAW_PROCESS_ALPHA);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialize FFDrawContext\n");
return ret;

2
libavfilter/vf_pad.c
View File

@@ -114,7 +114,7 @@ static int config_input(AVFilterLink *inlink)
double var_values[VARS_NB], res;
char *expr;
ret = ff_draw_init2(&s->draw, inlink->format, inlink->colorspace, inlink->color_range, 0);
ret = ff_draw_init_from_link(&s->draw, inlink, 0);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialize FFDrawContext\n");
return ret;

2
libavfilter/vf_rotate.c
View File

@@ -288,7 +288,7 @@ static int config_props(AVFilterLink *outlink)
double res;
char *expr;
ret = ff_draw_init2(&rot->draw, inlink->format, inlink->colorspace, inlink->color_range, 0);
ret = ff_draw_init_from_link(&rot->draw, inlink, 0);
if (ret < 0)
return ret;
ff_draw_color(&rot->draw, &rot->color, rot->fillcolor);

2
libavfilter/vf_shear.c
View File

@@ -261,7 +261,7 @@ static int config_output(AVFilterLink *outlink)
s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(ctx->inputs[0]->h, desc->log2_chroma_h);
s->planeheight[0] = s->planeheight[3] = ctx->inputs[0]->h;
ret = ff_draw_init2(&s->draw, outlink->format, outlink->colorspace, outlink->color_range, 0);
ret = ff_draw_init_from_link(&s->draw, outlink, 0);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialize FFDrawContext\n");
return ret;

2
libavfilter/vf_stack.c
View File

@@ -312,7 +312,7 @@ static int config_output(AVFilterLink *outlink)
if (s->fillcolor_enable) {
const AVFilterLink *inlink = ctx->inputs[0];
ret = ff_draw_init2(&s->draw, inlink->format, inlink->colorspace, inlink->color_range, 0);
ret = ff_draw_init_from_link(&s->draw, inlink, 0);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialize FFDrawContext\n");
return ret;

2
libavfilter/vf_tile.c
View File

@@ -144,7 +144,7 @@ static int config_props(AVFilterLink *outlink)
outlink->h = tile->h * inlink->h + total_margin_h;
outlink->sample_aspect_ratio = inlink->sample_aspect_ratio;
ol->frame_rate = av_mul_q(il->frame_rate, av_make_q(1, tile->nb_frames - tile->overlap));
ret = ff_draw_init2(&tile->draw, inlink->format, inlink->colorspace, inlink->color_range, 0);
ret = ff_draw_init_from_link(&tile->draw, inlink, 0);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialize FFDrawContext\n");
return ret;

2
libavfilter/vf_tinterlace.c
View File

@@ -228,7 +228,7 @@ static int config_out_props(AVFilterLink *outlink)
if (tinterlace->mode == MODE_PAD) {
uint8_t black[4] = { 0, 0, 0, 16 };
ret = ff_draw_init2(&tinterlace->draw, outlink->format, outlink->colorspace, outlink->color_range, 0);
ret = ff_draw_init_from_link(&tinterlace->draw, outlink, 0);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialize FFDrawContext\n");
return ret;

2
libavfilter/vf_tpad.c
View File

@@ -209,7 +209,7 @@ static int config_input(AVFilterLink *inlink)
int ret;
if (needs_drawing(s)) {
ret = ff_draw_init2(&s->draw, inlink->format, inlink->colorspace, inlink->color_range, 0);
ret = ff_draw_init_from_link(&s->draw, inlink, 0);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialize FFDrawContext\n");
return ret;

9
libavfilter/vsrc_testsrc.c
View File

@@ -257,8 +257,7 @@ static int color_config_props(AVFilterLink *inlink)
TestSourceContext *test = ctx->priv;
int ret;
ret = ff_draw_init2(&test->draw, inlink->format, inlink->colorspace,
inlink->color_range, 0);
ret = ff_draw_init_from_link(&test->draw, inlink, 0);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Failed to initialize FFDrawContext\n");
return ret;
@@ -941,8 +940,7 @@ static int test2_config_props(AVFilterLink *inlink)
AVFilterContext *ctx = inlink->src;
TestSourceContext *s = ctx->priv;
av_assert0(ff_draw_init2(&s->draw, inlink->format, inlink->colorspace,
inlink->color_range, 0) >= 0);
av_assert0(ff_draw_init_from_link(&s->draw, inlink, 0) >= 0);
s->w = ff_draw_round_to_sub(&s->draw, 0, -1, s->w);
s->h = ff_draw_round_to_sub(&s->draw, 1, -1, s->h);
if (av_image_check_size(s->w, s->h, 0, ctx) < 0)
@@ -2022,8 +2020,7 @@ static int colorchart_config_props(AVFilterLink *inlink)
AVFilterContext *ctx = inlink->src;
TestSourceContext *s = ctx->priv;
av_assert0(ff_draw_init2(&s->draw, inlink->format, inlink->colorspace,
inlink->color_range, 0) >= 0);
av_assert0(ff_draw_init_from_link(&s->draw, inlink, 0) >= 0);
if (av_image_check_size(s->w, s->h, 0, ctx) < 0)
return AVERROR(EINVAL);
return config_props(inlink);