lavfi/vf_xfade_vulkan: add circleopen/circleclose

This commit is contained in:
Marvin Scholz 2023-08-21 22:45:23 +02:00 committed by Lynne
parent b4f0701358
commit 95e366fb59
1 changed files with 37 additions and 0 deletions

View File

@ -77,6 +77,8 @@ enum XFadeTransitions {
SLIDEUP,
SLIDELEFT,
SLIDERIGHT,
CIRCLEOPEN,
CIRCLECLOSE,
NB_TRANSITIONS,
};
@ -179,6 +181,37 @@ static const char transition_slideright[] = {
C(0, } )
};
#define SHADER_CIRCLE_COMMON \
C(0, void circle(int idx, ivec2 pos, float progress, bool open) ) \
C(0, { ) \
C(1, const ivec2 half_size = imageSize(output_images[idx]) / 2; ) \
C(1, const float z = dot(half_size, half_size); ) \
C(1, float p = ((open ? (1.0 - progress) : progress) - 0.5) * 3.0; ) \
C(1, ivec2 dsize = pos - half_size; ) \
C(1, float sm = dot(dsize, dsize) / z + p; ) \
C(1, vec4 a = texture(a_images[idx], pos); ) \
C(1, vec4 b = texture(b_images[idx], pos); ) \
C(1, imageStore(output_images[idx], pos, \
mix(open ? b : a, open ? a : b, \
smoothstep(0.f, 1.f, sm))); ) \
C(0, } )
static const char transition_circleopen[] = {
SHADER_CIRCLE_COMMON
C(0, void transition(int idx, ivec2 pos, float progress) )
C(0, { )
C(1, circle(idx, pos, progress, true); )
C(0, } )
};
static const char transition_circleclose[] = {
SHADER_CIRCLE_COMMON
C(0, void transition(int idx, ivec2 pos, float progress) )
C(0, { )
C(1, circle(idx, pos, progress, false); )
C(0, } )
};
static const char* transitions_map[NB_TRANSITIONS] = {
[FADE] = transition_fade,
[WIPELEFT] = transition_wipeleft,
@ -189,6 +222,8 @@ static const char* transitions_map[NB_TRANSITIONS] = {
[SLIDEUP] = transition_slideup,
[SLIDELEFT] = transition_slideleft,
[SLIDERIGHT]= transition_slideright,
[CIRCLEOPEN]= transition_circleopen,
[CIRCLECLOSE]=transition_circleclose,
};
static av_cold int init_vulkan(AVFilterContext *avctx)
@ -539,6 +574,8 @@ static const AVOption xfade_vulkan_options[] = {
{ "slideup", "slide up transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDEUP}, 0, 0, FLAGS, "transition" },
{ "slideleft", "slide left transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDELEFT}, 0, 0, FLAGS, "transition" },
{ "slideright","slide right transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDERIGHT}, 0, 0, FLAGS, "transition" },
{ "circleopen","circleopen transition", 0, AV_OPT_TYPE_CONST, {.i64=CIRCLEOPEN}, 0, 0, FLAGS, "transition" },
{ "circleclose","circleclose transition", 0, AV_OPT_TYPE_CONST, {.i64=CIRCLECLOSE}, 0, 0, FLAGS, "transition" },
{ "duration", "set cross fade duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=1000000}, 0, 60000000, FLAGS },
{ "offset", "set cross fade start relative to first input stream", OFFSET(offset), AV_OPT_TYPE_DURATION, {.i64=0}, INT64_MIN, INT64_MAX, FLAGS },
{ NULL }