virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/vsrc_gradients: add spiral type

Browse Source
This commit is contained in:
Paul B Mahol 2022-04-05 17:34:33 +02:00
parent 8e1cedbb61
commit 21ca221068
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/filters.texi
View File

@ -25874,7 +25874,7 @@ supposed to be generated forever.
Set speed of gradients rotation. Set speed of gradients rotation.
@item type, t @item type, t
Set type of gradients, can be @code{linear} or @code{radial} or @code{circular}. Set type of gradients, can be @code{linear} or @code{radial} or @code{circular} or @code{spiral}.
@end table @end table

15
libavfilter/vsrc_gradients.c
View File

@ -79,11 +79,12 @@ static const AVOption gradients_options[] = {
{"duration", "set video duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=-1}, -1, INT64_MAX, FLAGS }, {"duration", "set video duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=-1}, -1, INT64_MAX, FLAGS },
{"d", "set video duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=-1}, -1, INT64_MAX, FLAGS }, {"d", "set video duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=-1}, -1, INT64_MAX, FLAGS },
{"speed", "set gradients rotation speed", OFFSET(speed), AV_OPT_TYPE_FLOAT,{.dbl=0.01}, 0.00001, 1, FLAGS }, {"speed", "set gradients rotation speed", OFFSET(speed), AV_OPT_TYPE_FLOAT,{.dbl=0.01}, 0.00001, 1, FLAGS },
{"type", "set gradient type", OFFSET(type), AV_OPT_TYPE_INT, {.i64=0}, 0, 2, FLAGS, "type" }, {"type", "set gradient type", OFFSET(type), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, FLAGS, "type" },
{"t", "set gradient type", OFFSET(type), AV_OPT_TYPE_INT, {.i64=0}, 0, 2, FLAGS, "type" }, {"t", "set gradient type", OFFSET(type), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, FLAGS, "type" },
{"linear", "set gradient type", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "type" }, {"linear", "set gradient type", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "type" },
{"radial", "set gradient type", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "type" }, {"radial", "set gradient type", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "type" },
{"circular", "set gradient type", 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "type" }, {"circular", "set gradient type", 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "type" },
{"spiral", "set gradient type", 0, AV_OPT_TYPE_CONST, {.i64=3}, 0, 0, FLAGS, "type" },
{NULL}, {NULL},
}; };
@ -218,6 +219,7 @@ static float project(float origin_x, float origin_y,
od_s_q = sqrtf(od_x * od_x + od_y * od_y); od_s_q = sqrtf(od_x * od_x + od_y * od_y);
break; break;
case 2: case 2:
case 3:
od_s_q = M_PI * 2.f; od_s_q = M_PI * 2.f;
break; break;
} }
@ -232,6 +234,9 @@ static float project(float origin_x, float origin_y,
case 2: case 2:
op_x_od = atan2f(op_x, op_y) + M_PI; op_x_od = atan2f(op_x, op_y) + M_PI;
break; break;
case 3:
op_x_od = fmodf(atan2f(op_x, op_y) + M_PI + point_x / fmaxf(origin_x, dest_x), 2.f * M_PI);
break;
} }
// Normalize and clamp range. // Normalize and clamp range.
@ -252,7 +257,7 @@ static int draw_gradients_slice(AVFilterContext *ctx, void *arg, int job, int nb
for (int y = start; y < end; y++) { for (int y = start; y < end; y++) {
for (int x = 0; x < width; x++) { for (int x = 0; x < width; x++) {
float factor = project(s->fx0, s->fy0, s->fx1, s->fy1, x, y, s->type); float factor = project(s->fx0, s->fy0, s->fx1, s->fy1, x, y, s->type);
dst[x] = lerp_colors(s->color_rgba, s->nb_colors, s->nb_colors + (s->type == 2), factor); dst[x] = lerp_colors(s->color_rgba, s->nb_colors, s->nb_colors + (s->type >= 2), factor);
} }
dst += linesize; dst += linesize;
@ -275,7 +280,7 @@ static int draw_gradients_slice16(AVFilterContext *ctx, void *arg, int job, int
for (int y = start; y < end; y++) { for (int y = start; y < end; y++) {
for (int x = 0; x < width; x++) { for (int x = 0; x < width; x++) {
float factor = project(s->fx0, s->fy0, s->fx1, s->fy1, x, y, s->type); float factor = project(s->fx0, s->fy0, s->fx1, s->fy1, x, y, s->type);
dst[x] = lerp_colors16(s->color_rgba, s->nb_colors, s->nb_colors + s->type == 2, factor); dst[x] = lerp_colors16(s->color_rgba, s->nb_colors, s->nb_colors + s->type >= 2, factor);
} }
dst += linesize; dst += linesize;
@ -304,7 +309,7 @@ static int draw_gradients_slice32_planar(AVFilterContext *ctx, void *arg, int jo
for (int y = start; y < end; y++) { for (int y = start; y < end; y++) {
for (int x = 0; x < width; x++) { for (int x = 0; x < width; x++) {
float factor = project(s->fx0, s->fy0, s->fx1, s->fy1, x, y, s->type); float factor = project(s->fx0, s->fy0, s->fx1, s->fy1, x, y, s->type);
lerp_colors32(s->color_rgbaf, s->nb_colors, s->nb_colors + s->type == 2 ,factor, lerp_colors32(s->color_rgbaf, s->nb_colors, s->nb_colors + s->type >= 2 ,factor,
&dst_r[x], &dst_g[x], &dst_b[x], &dst_a[x]); &dst_r[x], &dst_g[x], &dst_b[x], &dst_a[x]);
} }