From patchwork Mon Jul 24 21:11:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 42952 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp2187833pzb; Mon, 24 Jul 2023 14:11:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlGhXjn138ozGpVj3a7zIx60SkKNnxT4NlOy/VZf88RN0PqKYTupfKughmJ8TLcCw+bXEg0w X-Received: by 2002:a05:6512:1147:b0:4f9:56aa:26c5 with SMTP id m7-20020a056512114700b004f956aa26c5mr5475426lfg.25.1690233108101; Mon, 24 Jul 2023 14:11:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690233108; cv=none; d=google.com; s=arc-20160816; b=J0TILXoCYLUjiMKxX9sJ3CB4izUG2S7R5C+h/kIUOrqBXu7YI6RvNIGN4kbaaNOWXJ YbOLTIU8L1Ym0yYcxLF9KrBUd7f8UtqtLlp3irej/T3QaoOiuNnjOn3Jj/5t/P+LEov3 hwxaU1+fEldOOQmlG4SYBS//WOzervn9NHf1Mmm8ADuANhG/rWEBSdPFQXkoJnsIg5i6 5AMobdCgkouSO4AulQ1ezM9ohHph+V9mJPNkdCmwTNLPcJ5bWU7mlrJg0FhaK5Gncsmx LRlFOlQlE939fsvKeCh/rCdWxKaXTYQBkE1FZ5gvaEYOzKI5O4ADdbxjy4b4iwe1UD+r o0Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=/tr8P3e2wf4KSh2xx83ShVpibk8agU8gaUjseg7/VOE=; fh=nwMvC2rEvrxw3oi8lhns+cXSV39bEdECtcaEBNnUVDY=; b=bLJG25QOhD2Nr9ucOvDA3bt991rtvNjef+fKcldaA6X8WgFLzcru0bCIpi4IrGxOZ4 ADjkLMJQ/uGOhBI5PvcKfv3U6s47hMlpD55LLE0H4uJdniLmvVRaFMsgjiuj7vlM2HGs wjR71bcnMnAIoFm7VRHxTYKPAMxG1BhWS3tqmwAM0DpetSrbCoC+FOPbGTVffQ7sEAE1 UoWGWofkvMuKK8uwHSu+iuvoiwuGIcBN6qnwUtrjTG9NiNnrS6er7QoBuzV+m0rwbQrB j6B8ZSRrUGf+hpom4mXmKRT6DMK2YiU7xqinRpRD+9+heuqtArMPTC6x+Fuxx4wNl0oY pTDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=WLm03pD+; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c18-20020aa7c752000000b0051e0e397ae5si7190297eds.215.2023.07.24.14.11.47; Mon, 24 Jul 2023 14:11:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=WLm03pD+; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CEED468C7AB; Tue, 25 Jul 2023 00:11:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3D3568C579 for ; Tue, 25 Jul 2023 00:11:35 +0300 (EEST) Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-4fdd31bf179so7226507e87.2 for ; Mon, 24 Jul 2023 14:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690233095; x=1690837895; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vJjusWrMB2BLU4tSGO8DtPfu7cn0uLkb7zKtY76T5Sg=; b=WLm03pD+K6iaI06xDNhKskuRzXAICYZFFj/oPvAkJbZozeAiyjmyEVBz3aBuphxNu4 XllYzEN9UILuF+pjHZEqRWg+Xk8PRjTpv+CP4Lfq5Byy/0MQySkw+6hx14hjozDZNty8 HD/NVo65FIFGNX67sinDxSzwjT8nUTTI6cclsqlPmaZizFh1FSCmWN9lh8OFExcpPADS uPCSD5+cSfliFjNWwYd+cIlFKUb/zsnzcMSpGVEz2Dm7Jd+BeldDrkrQq/4zGiV5B5IN gym20OYLsSO1gc7e5SUb/z6/5cHndDsLYUaA2QhW2kH6QKveG33dBiRRUEoW8QVg65hA pKxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690233095; x=1690837895; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vJjusWrMB2BLU4tSGO8DtPfu7cn0uLkb7zKtY76T5Sg=; b=KvSn7TI29V4e8LYUy8Nm4vH+2Diee6mgqF4JUGLnQQJdVvyuZf31CrTtZxgjzkYVKz VIPG5lwpassOgHArkwLNiicmcPCGzQlAyO2tb9D69hK68nZMmEfSt5N1ZCoh4Lokro/c 64JQ3LJHSvg7/gGGfJGuY2rfgeZrHvpp5tqd+BxTE5DYQFb7aeBBNAj0T/adTAnB39He ULJ/ldKG8W0bTJoQ5HOiIxK5zbu4mB4c2yv1IfVdKjmswrXvomKOyGJbT/DtOp+FOgqa sjyhfWfowQkDXDreRG0qfijn0RGVDxeK51RRg2YMqnpYxGJuATKgidhkmryqSYDNtXz4 JVVA== X-Gm-Message-State: ABy/qLbRiTG5tPrLS1MqO156shj9NxuJzXb8suT/99Bbm1+MXxE24cc8 QgTejy0DpOI65wMWhTDi1LSLvqASWC0H/w== X-Received: by 2002:ac2:5045:0:b0:4f8:770d:6d7d with SMTP id a5-20020ac25045000000b004f8770d6d7dmr5062781lfm.6.1690233094580; Mon, 24 Jul 2023 14:11:34 -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 b11-20020aa7cd0b000000b0051e069ebee3sm6646072edw.14.2023.07.24.14.11.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 14:11:33 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jul 2023 23:11:06 +0200 Message-Id: <20230724211107.40025-1-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IA2wSGT78JFE --- libavfilter/vf_xfade_vulkan.c | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/libavfilter/vf_xfade_vulkan.c b/libavfilter/vf_xfade_vulkan.c index 8825717890..d044714199 100644 --- a/libavfilter/vf_xfade_vulkan.c +++ b/libavfilter/vf_xfade_vulkan.c @@ -76,6 +76,8 @@ enum XFadeTransitions { SLIDEUP, SLIDELEFT, SLIDERIGHT, + CIRCLEOPEN, + CIRCLECLOSE, NB_TRANSITIONS, }; @@ -178,6 +180,43 @@ static const char transition_slideright[] = { C(0, } ) }; +#define SHADER_HYPOT_FUNC \ + C(0, float hypot(ivec2 v) { ) \ + C(1, ivec2 sqr = v * v; ) \ + C(1, return sqrt(sqr.x + sqr.y); ) \ + C(0, } ) + +#define SHADER_CIRCLE_COMMON \ + SHADER_HYPOT_FUNC \ + 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 = hypot(half_size); ) \ + C(1, float p = ((open ? (1.0 - progress) : progress) - 0.5) * 3.0; ) \ + C(1, float sm = hypot(pos - half_size) / 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, @@ -188,6 +227,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) @@ -538,6 +579,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 }