From patchwork Mon Jul 24 21:47:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 42954 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp2203224pzb; Mon, 24 Jul 2023 14:47:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlEGgqcuumIgApBTOyRQVJrr91R6d/jPSz1D4lMUHrdq5+kczl9fOOJ/Bsh/yNTY1eHa75lJ X-Received: by 2002:a05:6402:160d:b0:522:3d36:ff27 with SMTP id f13-20020a056402160d00b005223d36ff27mr1367202edv.31.1690235261563; Mon, 24 Jul 2023 14:47:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690235261; cv=none; d=google.com; s=arc-20160816; b=tlglTRVg22kHbOwtaeIDWR8dZISiBJx7jc8UJ6AP+syjgPDx8UKfWAEICQLHgq6IZJ QEdhodiqpv6dktNdHcC9ENuNifIdcyAUkvQzhO9ULpvl1QYnbQzScezl5fCkx1UYrVsR 1SFEhHSbmI4jOBq254vA6CQr/n3ceONlL6DDE/m7AKe5EPXlLrHiEsw87ZmVpWUS8OBd 6F4EsZwjS/jFCwa+FLCbh5E6UjWIPXAVCrH14y0N7PQaqlkUfUjOCwREeh+devpMMuQM /Kc8r+Im+MM0pwngEsMHF/RCBGpgTooSgU80sd94r6GoD8vKnME/DUUhOGWZw0qBUm5h 2J2g== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=7zTunRR8PcE+JNowRLjmup5ROzyySEo95PigG8dpSPg=; fh=nwMvC2rEvrxw3oi8lhns+cXSV39bEdECtcaEBNnUVDY=; b=k41qTXYrKq7xglcApy1swITaQ8HeIe5iml3WD8ncdPBwG3jRmEarG/dVMhWbVUQgUz YHJ6yvGptcd5KoJG80+TI12Fca4LH9cAHkpT7ZJu+aQBSnuPCYS9iPz2PXiGpbECJ9/3 X3JP6tkqky2QXyrYJVcNStJ59DeAMR4GsypYvLdDat9G/WAKYD77Yqj46Ynj/PeN5iCR xFB1IfoEVTap1Qs4l/td9OchZha2IEuvlebraFb2Eo6xn0p+vZ9nv0JstIAab74Si9VC VScUnsW/xUOb0VggOrBbhOdmnQ+6QQkkRxPNHqCBReLnu5p5fT40pra1Hv6pISQXviRP jlNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=IAw1unSL; 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 d13-20020a50fb0d000000b005222c7ab4d9si2126167edq.351.2023.07.24.14.47.41; Mon, 24 Jul 2023 14:47:41 -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=IAw1unSL; 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 A01F568C7C9; Tue, 25 Jul 2023 00:47:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 143F168C51F for ; Tue, 25 Jul 2023 00:47:31 +0300 (EEST) Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-98de21518fbso811219566b.0 for ; Mon, 24 Jul 2023 14:47:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690235250; x=1690840050; 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=O28uNcMxciP6y4GVh6Udbjkx4X/PEp7mI/+4Q0Gzf7s=; b=IAw1unSLrwbG4aeCgyC79d+HRDtAPKoAsz0/kRWQYDGiwk3zcxu1ianSYbG0dK7FL8 wZG+2Z6331Tute31zdBvYjJK+IKR6yaz48pbh3EmcAmEjy/fsGODkO72Qq0UHBTZ5ykS /Y7Idq/icE2w7HMEV7Ho0d5h/RvDPnOaz6wHcDUcQoQAuwzF4M7rc+JDMxkS8vweu6Ks 0TtgX+vEjQkwDcKV3tDt1x2eoQfGCeE0y1TpLHlgqCeKEcJipPzYstI9GpNVpUj7Uhe5 Ej1fI2+EkH8rl4U9DILGzMMLu0WmTpqGi/x769IvHhIeVOpF1lTmALU9x29FYNp+LuFL ywKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690235250; x=1690840050; 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=O28uNcMxciP6y4GVh6Udbjkx4X/PEp7mI/+4Q0Gzf7s=; b=N13t5GoCVnHB0UU8vS0BnEy754v659ifDPJdrcAsILrHMEWS3JHwRSejk09ElELZEf V+l/5HXCNu7GR2z8ThmoyMaD6nnSXjkLcZ/flPUm9p3Vo1dDDMqLNBqXruLtiTyVs6KH MOsMT8XVX2vKAPvotQuI8usM2wrulEd9B4t2aX8ZpxSwDbS7LRfNOTeK6+rAmPxMwqK0 N6o+27I/9DlBmFEWgdL+UAkLGCIxvfdUAyJZx5pwVE0ZPYVoYO90VTSuKaCyH+dT2Wdu +iZWX/65rnBYzmfj0sCsKuBqyyE9Ef99aTRz4lRk7NA4Fc0/3XTFd7mbNzKWAAFD65zF R24Q== X-Gm-Message-State: ABy/qLbMS0HGLBkAdwYHNky/BCyqK3Nft2DKRcRljyHkU53bEZiLuHzz gidiaXJqMj1EiVOKMbjpoSB+Bzo5EFAfAw== X-Received: by 2002:a17:906:8a67:b0:992:7295:61d4 with SMTP id hy7-20020a1709068a6700b00992729561d4mr10023387ejc.3.1690235250207; Mon, 24 Jul 2023 14:47:30 -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 z3-20020a170906270300b00993017b64a8sm7236429ejc.224.2023.07.24.14.47.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 14:47:29 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jul 2023 23:47:26 +0200 Message-Id: <20230724214727.40253-1-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230724211107.40025-2-epirat07@gmail.com%3Emessage://%3C20230724211107.40025-1-epirat07@gmail.com> References: <20230724211107.40025-2-epirat07@gmail.com%3Emessage://%3C20230724211107.40025-1-epirat07@gmail.com> 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: Od6mauaXoeaI --- 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 8825717890..c3b08b52f5 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,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, @@ -188,6 +221,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 +573,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 }