From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id CB71146602 for ; Mon, 21 Aug 2023 20:45:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A39B968C36E; Mon, 21 Aug 2023 23:45:51 +0300 (EEST) Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5B2A68BF89 for ; Mon, 21 Aug 2023 23:45:44 +0300 (EEST) Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-2bcb50e194dso30714991fa.3 for ; Mon, 21 Aug 2023 13:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692650744; x=1693255544; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YHRkAXHFyF+OFMBkuUa946+Ic3yw94bFulk79wTl/fI=; b=LNr0Ri1YmLVpvUL2vCN5PDqQchb7PMePJBUmn0d4Vhe0sU2KzNWzLWvDqNrdGFffjs YyOGKmAYtbpJTccFeuJPCK7ZxjYR2gn9wIdcZcOdWjcYj//j4474n5JZOfN0Zd+5c7I2 GusNteXjEWcRUDTGw+kaaDgY0YQNYDkXLwJb/KlCWM4xocB3vayRt4utyewwg6Tl5+yj uhJzpsBgXKddcVA6uT7iNt319GG9VnU7NrE5GPlqCvFdeJru7iRT6O3m7NOZj6b0ptOr 45FAVk0wzTDVOyaWYABKrOl78dS7qT58+NDUarfweWuiYgTWNumF7DoX6OwJKAeLeUsI K/dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692650744; x=1693255544; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YHRkAXHFyF+OFMBkuUa946+Ic3yw94bFulk79wTl/fI=; b=LGH7E1Te9CL35ZYN+NvZwEY+dp/d1mhPQzzh02eB5t6YNQK1vzlfuwOO4N7zvG6iK7 bov4RYgvNwUQLYQqjWbR3ZVUWHLgoyAqhAAxgzjiidw/+r+H6lWpfLbcS9MKspf7498M 3xd9R2aR4lWb4+r7R9RMIuxw3LPOo/fIH9xEmODZuxdZM+pLZR3lsAtS0dWdqOj+liKI KxR3Y+u81fEssumg0vxSeTCTCBZlzO0mrwBXczEEvg9yG3JSy2dsG4+KePlLNT7UPWBK AOyyXXu79K6GSCpYaSpyvym6KtRNgbO81xKAYc4GoYQHekk14Ud+Hqy/DJ3dndFGO2kO g5lg== X-Gm-Message-State: AOJu0YyDjq5Qkl4T8MK9qr1J6V6kYze258xC4/Vgjct6lM96GBn0zKPR EUzAYSnyF7o5TOlJKbmM8bOt5DLWsQOmclFF X-Google-Smtp-Source: AGHT+IFEupxHDSQJZw/mQxWyxdP13CenHZymDyt1PjhCXRLkqpHw9KNNZdqjK+VYFmfXlDyfww5arg== X-Received: by 2002:a2e:9f0b:0:b0:2b9:e7d7:64bd with SMTP id u11-20020a2e9f0b000000b002b9e7d764bdmr5322231ljk.47.1692650743518; Mon, 21 Aug 2023 13:45:43 -0700 (PDT) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id z14-20020a1709064e0e00b0099293cdbc98sm7102176eju.145.2023.08.21.13.45.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 13:45:42 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Aug 2023 22:45:23 +0200 Message-Id: <20230821204527.4494-1-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230724214727.40253-1-epirat07@gmail.com> References: <20230724214727.40253-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/5] lavfi/vf_xfade_vulkan: add circleopen/circleclose X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Marvin Scholz Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavfilter/vf_xfade_vulkan.c | 37 +++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/libavfilter/vf_xfade_vulkan.c b/libavfilter/vf_xfade_vulkan.c index f393dde202..23c61bdb48 100644 --- a/libavfilter/vf_xfade_vulkan.c +++ b/libavfilter/vf_xfade_vulkan.c @@ -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 } -- 2.37.0 (Apple Git-136) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".