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 } From patchwork Mon Jul 24 21:47:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 42955 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp2203309pzb; Mon, 24 Jul 2023 14:47:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlGxnWoR1KVYXrzOn+M+J9i3Nhqq9c2aZjM5O3E4Or21xruMXNca4xyyg0P5feULnfZ94ZWa X-Received: by 2002:a17:906:30c5:b0:98d:696a:531c with SMTP id b5-20020a17090630c500b0098d696a531cmr10672058ejb.40.1690235271510; Mon, 24 Jul 2023 14:47:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690235271; cv=none; d=google.com; s=arc-20160816; b=P8iFrzjobpIhUBAEVel/BX/5tdEKHUu9fW79flObxU4Knc2EWjgyFePYXv/nCoTutR QOqrh6OFIkClQlcqFAynF4mst9SaTYK5nEVikvqA47jqSEXtRMrhQt8AC4WHK2nLn+iM ksOjiHRQlLb00tdna3OEsZJOMyClNYUlr5GX/AtxG58ZnkKOPhzGxl/UqRtDEcWMyJNO 8DlCh0bTrZAOFI+Z1dDrH2zyR/Jv5/XrjCosokc+DEoTeHQFMuuyRpF843w6oL9cCusr j/rPdFNYeIpzO3VusvqajGjFjg5L2N3jkctbvUZFJqmzfGIojJR27/Dxko167EJ4+BP9 XWug== 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=SV0PnRrZ1gsWWdqezh1hm2DG3PzmstgaVAaRDA3gxJw=; fh=nwMvC2rEvrxw3oi8lhns+cXSV39bEdECtcaEBNnUVDY=; b=EbmIfXz8E2TGxBMg+AWqCC+XlbhpC/5rWYCo0kGEMPBNlJDQ6RL5SK1HeiHUwHlWbE Eq8uThlUnAKtk3eLB2S2+qixhmNmEmEYgLAMsXTwQL4/7CkMwHux0ZcSaMMzP7I0e8yq zOkKzg18DxSwJuo2GzkRaBGQGOqtxxOcjs2lTKrFWYw9hL/j79C1zpjyDgBkQ7mnsMpp lJ3ADp18r9ZWUNxoR2QXEfUwCh2l+3aFUIzB342Uc/F6+goQ0YWp3mISW1nst1D6Lmf0 yXKLMH5OjAZX3uBvQxmb5wFGNvY6r7Wopx25G2QDizdLC/mY8Gzx7AlbNwFE4S+btIUi vw6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=JFcgsKsf; 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 t10-20020a1709060c4a00b0098e266c9592si6644679ejf.262.2023.07.24.14.47.50; Mon, 24 Jul 2023 14:47:51 -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=JFcgsKsf; 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 A7F6D68C7D0; Tue, 25 Jul 2023 00:47:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A74FC68C7CA for ; Tue, 25 Jul 2023 00:47:32 +0300 (EEST) Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-993d1f899d7so837232766b.2 for ; Mon, 24 Jul 2023 14:47:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690235252; x=1690840052; 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=VLYAcnyHZu4KeNy/ZhmSZixner/sa5V4Wbjnv7lP4YA=; b=JFcgsKsfqKlf8vevl1ZLN2c7RBAjlC5Siw3wPAwriBkgS/HVNmbDOX8zGc9/OJXMwX 7Hjlg6+kjFqFRhjB/qzN9xOfmxhhOud9CVKUUV9f4Xxl7IJwGdPHGy2sVyhcpHRZUII/ 29zIqgMgUO11wTBItHtvQ9Grr+KqGEFIIj1E6zpAKoVpgHpEhtdhLQRsQDo14MQujqcn Mf7LVzoaoNaU5N8SHo2fFVRSSrN2re0RyosW96jCRmiZqY9L6bsGzPrm6PaUqV7ScP7M LZCg05DeZ1fStD9l8O+xjH0BAfjTDdzEwVvGsHvSMcGKPIZiyOE7BFw7wB9NWCip2CoL v7Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690235252; x=1690840052; 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=VLYAcnyHZu4KeNy/ZhmSZixner/sa5V4Wbjnv7lP4YA=; b=LZgmull+5ZWhMpQ8IzFmuHYefb73yuQNBQl4qVu03f7j9F3lOgQ2Unw76Fa3Kfn4lH I5e4aWOXEseMdrnN7EYI0tWzAYBycMlgoZyDiVB0LBYuKFcNIWsWCiL0r1WrcWfzkfpU qHv9Fx69fI/l0cDSKwxEvQmA/xI2AefvYP698wmqL48X3+jg4QLS4L19EUNsiNjRF3dS qu3z023En+JWbITEfrCxmVWGyWMuO6Fousga+1uO5m7qAx9xekt3iybFowIs5g4BOWdb n9CXj5RYYSdKgs9hRYZk3pwsnvFMfCqrBmqm6xp6Wa8qivTJaunEy2pqB0wR/W80Ti5Y xMIw== X-Gm-Message-State: ABy/qLau0ZAkYGCqqNq/YCUn0J7zz6kK/sODm0qFQ+oosY1t0LeIIgnx XzQMQYonb5MiIQ55tsDIvdGByYw7dnVBlg== X-Received: by 2002:a17:906:3f0c:b0:99b:6e54:bd5b with SMTP id c12-20020a1709063f0c00b0099b6e54bd5bmr9615048ejj.50.1690235251913; Mon, 24 Jul 2023 14:47:31 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 14:47:31 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jul 2023 23:47:27 +0200 Message-Id: <20230724214727.40253-2-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230724214727.40253-1-epirat07@gmail.com> References: <20230724211107.40025-2-epirat07@gmail.com%3Emessage://%3C20230724211107.40025-1-epirat07@gmail.com> <20230724214727.40253-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavfi/vf_xfade_vulkan: reindent after last commit 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: o3x4CJzXPrx2 --- libavfilter/vf_xfade_vulkan.c | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/libavfilter/vf_xfade_vulkan.c b/libavfilter/vf_xfade_vulkan.c index c3b08b52f5..faa19a0518 100644 --- a/libavfilter/vf_xfade_vulkan.c +++ b/libavfilter/vf_xfade_vulkan.c @@ -212,17 +212,17 @@ static const char transition_circleclose[] = { }; static const char* transitions_map[NB_TRANSITIONS] = { - [FADE] = transition_fade, - [WIPELEFT] = transition_wipeleft, - [WIPERIGHT] = transition_wiperight, - [WIPEUP] = transition_wipeup, - [WIPEDOWN] = transition_wipedown, - [SLIDEDOWN] = transition_slidedown, - [SLIDEUP] = transition_slideup, - [SLIDELEFT] = transition_slideleft, - [SLIDERIGHT]= transition_slideright, - [CIRCLEOPEN]= transition_circleopen, - [CIRCLECLOSE]=transition_circleclose, + [FADE] = transition_fade, + [WIPELEFT] = transition_wipeleft, + [WIPERIGHT] = transition_wiperight, + [WIPEUP] = transition_wipeup, + [WIPEDOWN] = transition_wipedown, + [SLIDEDOWN] = transition_slidedown, + [SLIDEUP] = transition_slideup, + [SLIDELEFT] = transition_slideleft, + [SLIDERIGHT] = transition_slideright, + [CIRCLEOPEN] = transition_circleopen, + [CIRCLECLOSE] = transition_circleclose, }; static av_cold int init_vulkan(AVFilterContext *avctx) @@ -564,17 +564,17 @@ static AVFrame *get_video_buffer(AVFilterLink *inlink, int w, int h) static const AVOption xfade_vulkan_options[] = { { "transition", "set cross fade transition", OFFSET(transition), AV_OPT_TYPE_INT, {.i64=FADE}, 0, NB_TRANSITIONS-1, FLAGS, "transition" }, - { "fade", "fade transition", 0, AV_OPT_TYPE_CONST, {.i64=FADE}, 0, 0, FLAGS, "transition" }, - { "wipeleft", "wipe left transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPELEFT}, 0, 0, FLAGS, "transition" }, + { "fade", "fade transition", 0, AV_OPT_TYPE_CONST, {.i64=FADE}, 0, 0, FLAGS, "transition" }, + { "wipeleft", "wipe left transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPELEFT}, 0, 0, FLAGS, "transition" }, { "wiperight", "wipe right transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPERIGHT}, 0, 0, FLAGS, "transition" }, - { "wipeup", "wipe up transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEUP}, 0, 0, FLAGS, "transition" }, - { "wipedown", "wipe down transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEDOWN}, 0, 0, FLAGS, "transition" }, + { "wipeup", "wipe up transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEUP}, 0, 0, FLAGS, "transition" }, + { "wipedown", "wipe down transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEDOWN}, 0, 0, FLAGS, "transition" }, { "slidedown", "slide down transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDEDOWN}, 0, 0, FLAGS, "transition" }, - { "slideup", "slide up transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDEUP}, 0, 0, FLAGS, "transition" }, + { "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" }, + { "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 } From patchwork Mon Jul 24 22:39:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 42958 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp2226429pzb; Mon, 24 Jul 2023 15:40:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlHdKNgW/aJ75VtgB20zjuTK/hTe0JrxbhR/+vFdggnXO0nGyl5akJdbrtNEsHneYQO416f9 X-Received: by 2002:aa7:c481:0:b0:522:1956:a291 with SMTP id m1-20020aa7c481000000b005221956a291mr6342518edq.8.1690238434923; Mon, 24 Jul 2023 15:40:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690238434; cv=none; d=google.com; s=arc-20160816; b=m6Zc1ydotxBr46sJLUb2g5RIquHEMlV+LR1O7BLaOm4BeIm3Ynv5PgSgmQftIutEX3 3dmz6pUbRhuE9ETDu6XGbjBucn7s+FHGcZg4LlRwcz5jz2czbj4yz+pM1prcCa+538fh +FZmAm1eG11wkP3K4sPPrn1w2yp9Zk5rEoAh3zSkRHj30op1WsbHIffck3YE8kNJJTxR UjTPAK2QI5brkxzimCGzvVS+F8HVYtO0eVY/ItM/34SCML8pyG0wLitmngXZ6V15lQmM 2xyeZByHY1L75QKOLJaGPjxKT1QkITg1k7y79SktP0WK439I4FrlwTg+OY0xtoocy5qZ AGCQ== 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=n5tmMDcOKdxwF0SCiqpUb51Fxed1IGwr8Pc2Jg+xF0A=; fh=nwMvC2rEvrxw3oi8lhns+cXSV39bEdECtcaEBNnUVDY=; b=mIRljirk2ogFk/awrEeklRfx155B6CIA3XnR6sVohP/wiLiQuZfEUPcE65WAmabFKQ g1uj7j/JPcUZ7Cl4L2HRoGpB6LegBLeJ317PPyL/1s4iIRZkLAtI/Hn7toYp8pNYNiFT T9a1alieyp9lGnttqKFORBEGZTpwlo4y5p5sHF2p6fHC/HAHfO6zxPIhY6AaLDOPdYIT 9x6BnE3IJBl7daaOKM7XuUbTiVv9HBUQvkcmrDweC11aAE42x74ELV4cg6EHvgcpsxtZ YGG+4DCjZ3df2w9cc43CK6Wlb5YaNTcd2LLF674ABSfeK5nSd1DNjphye1fHlOoEKnjE kNGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Xz5iOFgN; 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 u10-20020a50eaca000000b0051e05ba162fsi6769788edp.653.2023.07.24.15.40.32; Mon, 24 Jul 2023 15:40:34 -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=Xz5iOFgN; 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 EC51C68C76C; Tue, 25 Jul 2023 01:40:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0DA168C611 for ; Tue, 25 Jul 2023 01:40:23 +0300 (EEST) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-98e011f45ffso719719466b.3 for ; Mon, 24 Jul 2023 15:40:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690238423; x=1690843223; 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=39inZMDPgHwIdnqFwH5ZHFPnSQhzAlZuKwFeq/VqNa8=; b=Xz5iOFgNvGvuzo3GLIvtRH64d7ufGAW0CoFrBjPObHh7r3XszdxGKsQIg/gWhjiNNg HBFYWJiCpuE0H0xLPBhmc5x1FkqHI95KXdc22Q1QGxZaVyMUkgdnAA8xljnAxlD0jV6C CV5/82wvB+mwJideLP3lUmICwtnHnxAGjOVD/+R2AJ3Ri2zv063aGtSrWlcV+KbOJfy8 917OR9qPVzbGhGYrj56C9Ny1p+MDElgy7X2Bh63jPrmWQ2wkTLrAftlrH1jhWdxZhJKf ev3zNSu5u3VmPLhs7AWAXsCd5/eY5KxB+MrYQkIxUuMozEIhEB55wuh5YAZuvw0i7wjq SHAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690238423; x=1690843223; 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=39inZMDPgHwIdnqFwH5ZHFPnSQhzAlZuKwFeq/VqNa8=; b=kPUuaQPzqLO07BkuNhlahnlPC75+wbj0mNGiyWCrAXQntnQi6vQavk0xwggm/6ED9L rzkCqkEiBEuFneDWYXYvN4gLbriUrMwaWQkxUYCUO1xSQllDYPWFrCh7bn7nqZXlVv1P 8NrVjzHJABtrpMycw+cVYeZ29CW7nz9gcrc1VFlsdnH2bH7lphGcJmnQaFf8OBhSsv7F Q/oRanRx4ot6YasAemJrulKF9s+mo/De732Eb6s3BTKLC+VUX2e99iu5bzqd6r1LVYWb hw1PlxCZgFXU4+QvMKSQERIo+es78yw8zXQbSt6kGeVUBRbsOAdb1bWqRJoWdd6pezBf ECxA== X-Gm-Message-State: ABy/qLbWbU3IiHslCJ63O4Cyu5D03ngUaVMEAqEZX+dstlMTxnbDVaY0 att6TPb54MVmwM8uIeBdRQVzeEM85Ner6g== X-Received: by 2002:a17:907:272a:b0:993:6382:6e34 with SMTP id d10-20020a170907272a00b0099363826e34mr10155640ejl.72.1690238423076; Mon, 24 Jul 2023 15:40:23 -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 pj17-20020a170906d79100b0098d2d219649sm7444755ejb.174.2023.07.24.15.40.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 15:40:22 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jul 2023 00:39:38 +0200 Message-Id: <20230724223938.40506-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 3/3] lavfi/vf_xfade_vulkan: add dissolve 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: W+oJvgEwRNJ0 --- libavfilter/vf_xfade_vulkan.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libavfilter/vf_xfade_vulkan.c b/libavfilter/vf_xfade_vulkan.c index faa19a0518..0409d6bdb1 100644 --- a/libavfilter/vf_xfade_vulkan.c +++ b/libavfilter/vf_xfade_vulkan.c @@ -78,6 +78,7 @@ enum XFadeTransitions { SLIDERIGHT, CIRCLEOPEN, CIRCLECLOSE, + DISSOLVE, NB_TRANSITIONS, }; @@ -211,6 +212,23 @@ static const char transition_circleclose[] = { C(0, } ) }; +#define SHADER_FRAND_FUNC \ + C(0, float frand(vec2 v) ) \ + C(0, { ) \ + C(1, return fract(sin(dot(v, vec2(12.9898, 78.233))) * 43758.545); ) \ + C(0, } ) + +static const char transition_dissolve[] = { + SHADER_FRAND_FUNC + C(0, void transition(int idx, ivec2 pos, float progress) ) + C(0, { ) + C(1, float sm = frand(pos) * 2.0 + (1.0 - progress) * 2.0 - 1.5; ) + 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, sm >= 0.5 ? a : b); ) + C(0, } ) +}; + static const char* transitions_map[NB_TRANSITIONS] = { [FADE] = transition_fade, [WIPELEFT] = transition_wipeleft, @@ -223,6 +241,7 @@ static const char* transitions_map[NB_TRANSITIONS] = { [SLIDERIGHT] = transition_slideright, [CIRCLEOPEN] = transition_circleopen, [CIRCLECLOSE] = transition_circleclose, + [DISSOLVE] = transition_dissolve, }; static av_cold int init_vulkan(AVFilterContext *avctx) @@ -575,6 +594,7 @@ static const AVOption xfade_vulkan_options[] = { { "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" }, + { "dissolve", "dissolve transition", 0, AV_OPT_TYPE_CONST, {.i64=DISSOLVE}, 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 }