From patchwork Mon Aug 21 20:45:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 43281 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:47ca:b0:130:ccc6:6c4b with SMTP id ey10csp1675676pzb; Mon, 21 Aug 2023 13:46:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEKA44E96UD9DbEuHqtiLnSLxkaDD2qfkhFC5lsyBUygs1oCEB9zWULSrY0CaMJgzWxIDHx X-Received: by 2002:a05:6512:a8b:b0:4f8:4177:e087 with SMTP id m11-20020a0565120a8b00b004f84177e087mr6263478lfu.47.1692650777910; Mon, 21 Aug 2023 13:46:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692650777; cv=none; d=google.com; s=arc-20160816; b=kIgmduL2n3yFUUjDmsmy6IdqWoZUZT5+RrXanUifaq99ymuYP6MNYKxuR3nUeUjo7K RALy870oEhIf1ozymJjL+GAZQSlbS1UziAzcARKf+aKZ72Gb4iAfXajpzGTVP8nrj4dC jlQTXP5eL7tcvP3GV5SF9c/W7NG5yRtv9vz0YUP2INw8yDo0/4pmVTMUdH+37NwTpSt+ NqxsRuUiZshG5Nma2nrSiLyIVBFBvlxTYZkifunDPyHnA/2dAM5qd/BpBE4zVos3AHGy TuwMWbJnl9u0DkCqVemVFFqZzYvW2s2tGGNUQQ4nf7bk6fapTRvAEcNio6qXzdHU7sWq SJlw== 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=7klG2RdgklCwh837439OpDngC9+eWQcXwpk0iDv4jgw=; fh=nwMvC2rEvrxw3oi8lhns+cXSV39bEdECtcaEBNnUVDY=; b=uGiCZCXa+78NtOgHOiX0+0/gCBUXGrsuYELVdlrgTfw/9e58/34V1feHYGVb/f0hJS 4fHHZ89lhfNlPzBqOmQDvx8MjwG/vzc8xbK7Nor94EMHosoqSvaPIskEchAehr2nBIGz 7PCSRNN37iWz4k4s+fayS+6sGgvTHKUPxEHZTcIT2fCc8+FV5jyVTSPdQW8mKd16SnhF hGv5TalkKXH39Ezuff+JmU2e/EsUNF+eFUhaTvfCh11mDeaiPUp6rGctblLRXfGoPeFG T/w5ZvQC8xtnPHXVAk1J7WWnolg3gpR/fr8n5FMMrl6IjoMHZGYY03we28EYWrQt1r+c +8kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=LNr0Ri1Y; 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 s12-20020aa7cb0c000000b0052597c080d4si6105451edt.395.2023.08.21.13.45.55; Mon, 21 Aug 2023 13:46:17 -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=LNr0Ri1Y; 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 DA56668C394; Mon, 21 Aug 2023 23:45:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WVisdmRgf/qS --- 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 } From patchwork Mon Aug 21 20:45:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 43283 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:47ca:b0:130:ccc6:6c4b with SMTP id ey10csp1675736pzb; Mon, 21 Aug 2023 13:46:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH0BMBB8X/RzVPwxfA1+rqg0dF2fxvKPGMQjbp70u4gipQOW0bhvb38IDcyzPInQat+Jepv X-Received: by 2002:a17:906:20d7:b0:99c:ac84:663b with SMTP id c23-20020a17090620d700b0099cac84663bmr6384792ejc.65.1692650785285; Mon, 21 Aug 2023 13:46:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692650785; cv=none; d=google.com; s=arc-20160816; b=y1DMDMknchAXSz0QJ6iui8I+B/BpQyUA4aL1QvKI8DbK0iTDlPfpz11FCxaS9AL6c7 ttVEUQr+mRvjnqEGs6ivxYFeLfrbzbVR6pTAThDRSjl/jBA+G2FJPcpWV14Xjm08mFMy Mc/CKUgfO3CRSWE7NrSGcC9XE6M+ntdxXN91i4dguwJmye6O4CrKT06jpvZE98wNqxsx SQQtfId1pdQkxF8kk/vLHHm83q8ryQSG5Ots7BT5V3HDdlddbG7AsFMNAT0RWSzsmEY8 R6cNbp+Djj6HxOr4CY0Xl6Ix1HsAHCZfudOAyO1d7JCfhOCBkdxE8fFraLgAkgBa9mQ7 JJKQ== 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=001KjW+f2DPSe77jKoMQcmAW51F+7mn3W9F0JkFzzFU=; fh=nwMvC2rEvrxw3oi8lhns+cXSV39bEdECtcaEBNnUVDY=; b=A4trmhdYAWRolAWf7ys5Ry5Mhjs8wN7cky7RfBQO/0Tk1VBXcFHF7H7+KvAFn/Kl8q B5MZJRrRDp83jLx1BP4n6uKFXiQaPL95NTqGyyIG5MTHGy8x2T4PzhwHS/kBQrgcsz9g n4X/n0MVOve8FOnZWdMngQajzN5/UM4FH5HFSVBAHQoDwZQI7a+q18s+CVjhCJhmFfhm 4slGuoPN2HBqnvyQIc/4x10CfGxCbPcREo2ndXC0F7Ae1Mh7m7j9Ex5wa4YM60mwxEs9 o79TzIOKR3oauU2mw37Ul0Mcv3h43q+7YsM0nZnAnyO/06QYOlHHmZgF2tb+jTTf9+mY GqwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=g+QUq8st; 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 pw19-20020a17090720b300b0099bcf57414esi4475870ejb.896.2023.08.21.13.46.03; Mon, 21 Aug 2023 13:46:25 -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=g+QUq8st; 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 D253F68C3BA; Mon, 21 Aug 2023 23:45:52 +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 5898068BF89 for ; Mon, 21 Aug 2023 23:45:45 +0300 (EEST) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-99357737980so496741566b.2 for ; Mon, 21 Aug 2023 13:45:45 -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=tXZvVpKXFEjeeceI/FzhX331Q2dsfm4dWsGbJjJZF2k=; b=g+QUq8stCV7MdAnBmKLRGsB8XbzP2k4mUGbgK5tTSxEIQ4E1TMpE18UMzxANYNW3d2 n/ta/I0f7Ap18b6cHGPkBSGsIuA40wxiXV5QNsORAJ8yV8X+Q+VkFFzm7Fr16Xjjpndf rP37mrEPogbYXHU8rNqVxSIm3d4BlO/splknIkfoXhcRV5rcW9N1Wf0neWkRoYxQfK7N IUE4HO882a7voZRfwfU09JW0Khfk4UL+GZotWMKV/Ysb+BQph2+SWICKg1AyCicehc9x V04Zj9TIbWNHB8CgiqOlQarBTsBCz8rpDzoP71zcL1F49g1T5AT/FaJK486HKh8Iq9r+ NWxQ== 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=tXZvVpKXFEjeeceI/FzhX331Q2dsfm4dWsGbJjJZF2k=; b=M9Z+XjkSu2OU5jep1SRjyp8yN9EJ3RWvYT7f7ndx2bpmGjtpQmq54PtxelTcCGEqXu YA+DSJjHM1gePBz1u7nXWVYKlO5K/NC7+I9fs1tPMIcwiT+HKeVCSEq3Io+eNI9tj/I3 uIdWfGgCG2EKXmMEo5oDaxg9Q6dqMumt7y5SnCLuQZpNmp9sVM2cjcDRHgJ4ZKjgfhn4 tHiCIjeF1MDCeBpTVBojT5OBauG9PBunFdIGGrzUAwASPrZkuAAFF0GvYKNnWhvd6N2s x9OwGt7+fH+O8XYRnfkdgc0F4x/RW3xxjrabkEAXYCqI0vTQEdrZVLFSmZdQnjx7VzCI +PQA== X-Gm-Message-State: AOJu0YwHjPAyN/xNGI1RdPIsbw9nkOdJN8m3Y0wBwv/97IQdn/EcCdxX 6efTrLllqtLm3eljeNHW7c+16mumG99XvYXK X-Received: by 2002:a17:906:1bb1:b0:993:dd1d:8251 with SMTP id r17-20020a1709061bb100b00993dd1d8251mr5490510ejg.28.1692650744430; Mon, 21 Aug 2023 13:45:44 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 13:45:43 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Aug 2023 22:45:24 +0200 Message-Id: <20230821204527.4494-2-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230821204527.4494-1-epirat07@gmail.com> References: <20230724214727.40253-1-epirat07@gmail.com> <20230821204527.4494-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/5] 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: vQ42ixt7uID9 --- 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 23c61bdb48..880b3b1afe 100644 --- a/libavfilter/vf_xfade_vulkan.c +++ b/libavfilter/vf_xfade_vulkan.c @@ -213,17 +213,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) @@ -565,17 +565,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 Aug 21 20:45:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 43285 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:47ca:b0:130:ccc6:6c4b with SMTP id ey10csp1675792pzb; Mon, 21 Aug 2023 13:46:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG72Xb7eMRrMYK8duX5hF2Ru07kXT23GqralCTf7jUQwWwMhsCy0prjoWUroHokHcqt+jQw X-Received: by 2002:a17:906:2099:b0:99d:a881:7c26 with SMTP id 25-20020a170906209900b0099da8817c26mr6900302ejq.5.1692650793145; Mon, 21 Aug 2023 13:46:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692650793; cv=none; d=google.com; s=arc-20160816; b=ts5NrgDl6GuA84LBhqzClIJPFY0n+vM/ARHB7wVA/4xIP3V/UQGflnb5b1fXzE0u8u dVLR3qXuT4us2b3ueNlZlIbNRHYcPNPxFZF3WLBgcJ495zQECD2xEa8FZPuGNKpmiiZW tZCGCpNAESGJ3I1YeXEyMvIoC0H/GgqE3GvNLHZ6wWzvZ2qx/MdIkp6wwMvfxMeT6JuO nkRd8CNEY0u6TDpffzzGjXfW7U53tcsk4Yll21EglDk2x1yM/ONaICuvwgrfa5brKV54 2sNmgkRcohVTBFDPZWXbW9QSywiWleweNXfNhWN0ks+6tZdPmX/rS/uifXIpQXJyzNo0 W86g== 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=ipXojLP6u+7NVQwjCZtSoqm5lijZ4GWS2ef79lkpPdo=; fh=nwMvC2rEvrxw3oi8lhns+cXSV39bEdECtcaEBNnUVDY=; b=tVlDjXFwbnt5AiHmvoe8JbL9QRtmqZ6rbXvEn1LNjZuKfgs/fbFvfNUoPtoZdWi9o+ edJRbHFSSs7p4bTav0Nxnw7me+STpD9d85W+Hh7IB/NpSZmQV6ZnidqpsvMK0NOKX4rj cMyWVOM2Y+vLxcB42hYCO+74Ts3pw9yBAuVvoZGOb76y3RYebmB9Q6O0ko+tq9fguUY8 OBiLLkUKAxDrTUHR3ru+DudE5Y1dD6KCfQ+1fyMPAiG5ZnLG9GYs4ojyyzb79Xl6xGXA P54RbsPWUVCvmxAt6LmUGInnjDPPOAT9EV3dYh/2s3pANOywpSQvSKSAOd9Ptofyv8KR lLOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Ujr+51wh; 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 j7-20020a170906050700b0098821ac27b7si6020338eja.39.2023.08.21.13.46.12; Mon, 21 Aug 2023 13:46:33 -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=Ujr+51wh; 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 DD43C68C3BD; Mon, 21 Aug 2023 23:45:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D5FE68BE6F for ; Mon, 21 Aug 2023 23:45:46 +0300 (EEST) Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-2bcbfb3705dso20077361fa.1 for ; Mon, 21 Aug 2023 13:45:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692650745; x=1693255545; 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=JKS3yr81Wn2/qCqDI/hRXDJQzs4zAjk3brP/+/I09cE=; b=Ujr+51whOJCz3zc5nerIvv65Vxay9KXBQecvWrzymmL2E202X4c1uciYzNlRIPdduW qtc2mm+0K/fN75KbOhhE1NWpd2ugFySj/YcY9WuxRxkMUiCfevYuCqcPQyIjauKSIaro cASKi5uGJsO+Y9fg3NvF7R0lCfrsIvMEzGRmzVbZrIpCRHg2hAgiOnn+09OWuYMhuKk7 QN7KHcSQ+Qow+J61g3tpgZ8fciU50Q+ZFlVIhMxd580u9rDWLPE0GmChlv/CYpydt5ow RXAblpr6YAI9HvD5JtFoNMsZJ2DOwcuy0CWL1+X/AOrNS2Ue9U5p59uieV8qUGHHLCXM jvCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692650745; x=1693255545; 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=JKS3yr81Wn2/qCqDI/hRXDJQzs4zAjk3brP/+/I09cE=; b=PWWhHlqzDNq/4lJkI53qOhHBdU4Cv3pJDpyb6ERPTDCmKupD49pgi7MFKoMQ33iMju RmKkrDE8RRhxF+0q2QhF+8J/M2ttUGcksVC0BnlHurOc3XU+PfJOOUSDT1pKOJZpQr3D pB4/KUO4gV8yZWCK9L9cmjhr0o0DVUitargLfE4wMBFJs13X6ctpkv6N6/lHnq5y5H+D DBAWOwgL8tHzxOQdTTDly2NE3EF5dOartv2eMfUTWPNJcf/n4fftfAJx+TJy/XC8G69p zg5rLtedx+3ISaDfS8QvaPO/Z96NMPkCg+J3n7PoZVwsNjogt9shYENM3GrRSeUFyhn0 TgKw== X-Gm-Message-State: AOJu0YziCXX4kigcqIZ6d4nvOE7wBePCC0db3qkSaF7yISN0hRbmOGLS Wgfmn0Hb5qKQ7V5tdWxnDM4RkNCjXFAN66Af X-Received: by 2002:a2e:81ca:0:b0:2bb:a28b:58e1 with SMTP id s10-20020a2e81ca000000b002bba28b58e1mr6285313ljg.41.1692650745406; Mon, 21 Aug 2023 13:45:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 13:45:44 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Aug 2023 22:45:25 +0200 Message-Id: <20230821204527.4494-3-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230821204527.4494-1-epirat07@gmail.com> References: <20230724214727.40253-1-epirat07@gmail.com> <20230821204527.4494-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 3/5] 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: OsvLjuAmKk6d --- 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 880b3b1afe..61111f932d 100644 --- a/libavfilter/vf_xfade_vulkan.c +++ b/libavfilter/vf_xfade_vulkan.c @@ -79,6 +79,7 @@ enum XFadeTransitions { SLIDERIGHT, CIRCLEOPEN, CIRCLECLOSE, + DISSOLVE, NB_TRANSITIONS, }; @@ -212,6 +213,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, @@ -224,6 +242,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) @@ -576,6 +595,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 } From patchwork Mon Aug 21 20:45: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: 43282 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:47ca:b0:130:ccc6:6c4b with SMTP id ey10csp1675700pzb; Mon, 21 Aug 2023 13:46:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHfqkpRvUbmIJvvggcuQYh4a3toD1Wx+tFh5NnwF/1ml5dbb0ncpgh/sw7MALaKEezKWA85 X-Received: by 2002:a05:6512:2806:b0:4fe:3e89:fcac with SMTP id cf6-20020a056512280600b004fe3e89fcacmr6386321lfb.34.1692650780694; Mon, 21 Aug 2023 13:46:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692650780; cv=none; d=google.com; s=arc-20160816; b=kii3cu8ZOGJZXm5GJlbO4WYqE7WbnT2TJhR3+LaeuzU3pUqKA7ZoRPrih2QsHRQTFB Z7vWNAoxDOeRNlmRN/+Jr0NP9pVuLd/3bOcDVu3ydwRA223IpLTcTyQLZ4jNaXqf1r5M ej7daPklVM1PQpIW3BJeCTMOOYylPygWHh40TVaWHEGxURCiVk1FsQSvU4KAW1b8HTl1 +RBC7BMteHJ9SSBTnsj1xPNjjPkf0HIT7O7Tazom/qTmR3EpqOKjnUngkKLmqzx5iD9N K7f9JBqwl85LpFeD3Axpxf2xiKg9nKkVJq+S2OOv2M9sn4ayy8yjuLJbcqnJAEmX20gQ VR4Q== 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=AGplnGmQBAKKeHHt+K4vzaacHhRfoM1pKkHDqSoaWMw=; fh=nwMvC2rEvrxw3oi8lhns+cXSV39bEdECtcaEBNnUVDY=; b=RgAjvdfSviOhkLXI1Gi7MXpHSc98cCdfIVT9V/LChjPnJV1PqfeGt2QTHi/ZkC38Fr q5KeUwH0DUr8cH5zi6K87iTDwEPlc+u+tj1KwhX5XzHtXmPxGhzvQf/sVSVlkjr1oroV /amUxxXQo/3bbLkzmH+VKWeTehhVieMuXkAHK5fU2x2Pb6kqHUcWCSMKRVFPh/acKIlC RSqFMvOiC2sOeWnKkMHAkDxNBMDdgvztuSbZDb64DLEFEIUfuERPVo/pIT6CqbRdVZC8 2CPckkGFmqbu1NI9RjaSdfQmUnK5kxzNJAWXMFhg2+8nn9ftCjYvpe5naVvtPB37SgHG XARQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=ONrRy466; 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 k23-20020a170906159700b0099bb83fdfc6si5654977ejd.408.2023.08.21.13.46.20; Mon, 21 Aug 2023 13:46:20 -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=ONrRy466; 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 D00A268C462; Mon, 21 Aug 2023 23:45:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BC8868BB00 for ; Mon, 21 Aug 2023 23:45:47 +0300 (EEST) Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2b9bb097c1bso59090051fa.0 for ; Mon, 21 Aug 2023 13:45:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692650746; x=1693255546; 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=Oo04IL5oTFx9UxKmP0W+YRabPKie5hhhK3xNJ3qx2DY=; b=ONrRy466fXg64juH/ciOA7WtMWCTMEgkvAioZ31zctBUKTNQVwsTXkztZp4RQkfthS bT20U4PPJ5Nlqodbv8z6ioSBYsVkQw4iWCqeimsXCx4F76t9wtUq5A+YpKcdiCYTTDgv w/QE6F9aAP2gUCVgJgY0GrAWAL9VoGVgSBDOaxgIw89zBsqkRGA2QH4DENleevHJD5EV VvXyea9FpIDrUwzwg5HanYgIcwqiz3teSdREPvhaJlP6rGA8wwUsBZWmTdr/nEapr0HA ksXieg7EcXUEM/2/CKofPIfW19Xh5Era5DrdPUiO2mIzIi45Y5351SftPTuQNfp6z3eY tNCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692650746; x=1693255546; 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=Oo04IL5oTFx9UxKmP0W+YRabPKie5hhhK3xNJ3qx2DY=; b=EhrlUhLwb4n+qD0mph7dQ46LtFZHDsc7Oza7jtTdVXC0ZNB0trGaSh0jh9Etb9LJ8W v89sJmb75of2pB3jhCN8KEJUbzTJcqZX/G+wj8aH/cvavxRb3aLJv0QsO+rb7jjPT6Nz dPSyaxSi09siWrVUb2gYqZoNdx15IlmdBVUpALpBHkmNZooAYPphYW6rNRCwsj1DxaaO VbkB5k8ajS1V7/gD4qnxsTSH28/NpIQ7VBDXUf2k1fGM5AE+8iIsAosdtPV6Mv77jEDt Tql8ihE8qmxy5uoepT2utWzirO35fwR5Z0eqprngCUqpngT3CS8tFFjH0Zi50K1jamF8 53zA== X-Gm-Message-State: AOJu0YzMxFYgD59Yie2xwnIYZyiPD4QN68zgSHpkhL/fVI114MNTtsMX sjlbjdYWTnysdt/L41SxXicvzswgJjtyoqaH X-Received: by 2002:a2e:6e0e:0:b0:2bb:8eea:7558 with SMTP id j14-20020a2e6e0e000000b002bb8eea7558mr4972269ljc.13.1692650746379; Mon, 21 Aug 2023 13:45:46 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 13:45:45 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Aug 2023 22:45:26 +0200 Message-Id: <20230821204527.4494-4-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230821204527.4494-1-epirat07@gmail.com> References: <20230724214727.40253-1-epirat07@gmail.com> <20230821204527.4494-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 4/5] lavfi/vf_xfade_vulkan: add pixelize 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: 6rg5CKvpEjIO --- libavfilter/vf_xfade_vulkan.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libavfilter/vf_xfade_vulkan.c b/libavfilter/vf_xfade_vulkan.c index 61111f932d..283a8e0710 100644 --- a/libavfilter/vf_xfade_vulkan.c +++ b/libavfilter/vf_xfade_vulkan.c @@ -80,6 +80,7 @@ enum XFadeTransitions { CIRCLEOPEN, CIRCLECLOSE, DISSOLVE, + PIXELIZE, NB_TRANSITIONS, }; @@ -230,6 +231,21 @@ static const char transition_dissolve[] = { C(0, } ) }; +static const char transition_pixelize[] = { + C(0, void transition(int idx, ivec2 pos, float progress) ) + C(0, { ) + C(1, ivec2 size = imageSize(output_images[idx]); ) + C(1, float d = min(progress, 1.0 - progress); ) + C(1, float dist = ceil(d * 50.0) / 50.0; ) + C(1, float sq = 2.0 * dist * min(size.x, size.y) / 20.0; ) + C(1, float sx = dist > 0.0 ? min((floor(pos.x / sq) + 0.5) * sq, size.x - 1) : pos.x; ) + C(1, float sy = dist > 0.0 ? min((floor(pos.y / sq) + 0.5) * sq, size.y - 1) : pos.y; ) + C(1, vec4 a = texture(a_images[idx], vec2(sx, sy)); ) + C(1, vec4 b = texture(b_images[idx], vec2(sx, sy)); ) + C(1, imageStore(output_images[idx], pos, mix(a, b, progress)); ) + C(0, } ) +}; + static const char* transitions_map[NB_TRANSITIONS] = { [FADE] = transition_fade, [WIPELEFT] = transition_wipeleft, @@ -243,6 +259,7 @@ static const char* transitions_map[NB_TRANSITIONS] = { [CIRCLEOPEN] = transition_circleopen, [CIRCLECLOSE] = transition_circleclose, [DISSOLVE] = transition_dissolve, + [PIXELIZE] = transition_pixelize, }; static av_cold int init_vulkan(AVFilterContext *avctx) @@ -596,6 +613,7 @@ static const AVOption xfade_vulkan_options[] = { { "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" }, + { "pixelize", "pixelize transition", 0, AV_OPT_TYPE_CONST, {.i64=PIXELIZE}, 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 Aug 21 20:45: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: 43284 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:47ca:b0:130:ccc6:6c4b with SMTP id ey10csp1675751pzb; Mon, 21 Aug 2023 13:46:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH1KBy9YUyd6kOrTOSdMKo/PfOzwiEGOq8i6j/ktyNN/5RJvOO+80opRN90ahurvhCyNeXr X-Received: by 2002:aa7:d14d:0:b0:525:5a63:5f8e with SMTP id r13-20020aa7d14d000000b005255a635f8emr6118397edo.27.1692650789017; Mon, 21 Aug 2023 13:46:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692650789; cv=none; d=google.com; s=arc-20160816; b=cVa1kNzUijrBAMAQmPFkadbgUwLxW6ZUjCELaKsQuDeGrTqM6XkkQO9YfQcYZvL/g3 gTpJ3dpQqOOq3m2WVZrXkB2fL82Tfr4hzsjKPWYbOQjs2meLfD33ISMRNmb7TtMmNDXY Xo9YDFwGQMe+cpOcYxZCDw3UxyXmqKCfH1LVw3hF/qPKMbfd17LX6iOlnsoFlg60DkYe Hu+UiViZ/mOErrAZhvEZm/200OGAX7ADbSxzA1L9cxA4IZUZN81c4XVT6ekCoeYYGe8R hsG1G88zjnfL9OxrDBfaqYXr8xyS8+JLGxy9owPSlYqLSnHdTZNVElyJ7QaSyohAyRX0 8XxQ== 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=oc5zRe7336lz0orZan6sTPw20FuubGb2rVTWuShsyT8=; fh=nwMvC2rEvrxw3oi8lhns+cXSV39bEdECtcaEBNnUVDY=; b=pZGz+R6pYDlbC+XlWWqEbLfDyby45KqQuPOqFqGxHa91tVxmI+Nf9Aqj/ph3g7uH2N 1XyNJbfg/cK/yrrtq8GlwL+/TngKzzECpF25idYHnzM1idhWJ2ZAcE0Gw/x+WkVs1Coa NN1/QDLpntXLtKSFJK+uD3msOn/rtfbMEvMXySLhBmcptsq+NgjaQMwx5pAMdMeBawtI WBZnH4cRAyCfJ9p2eW0n4JTVWpSYqNrfHcsXNlobm0DVf38bQgleSATskuzPiVxOiiSp 4REFwE9eMLjNkHzSSTG+F8SjHhRkp2R6btAwNQvztDxay5dA/Byv0/jo+EkZrQz9Mssu ueug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=ol3bILi0; 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 n18-20020a056402515200b00523d2b12507si6168659edd.414.2023.08.21.13.46.28; Mon, 21 Aug 2023 13:46:29 -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=ol3bILi0; 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 B0A9868C430; Mon, 21 Aug 2023 23:45:55 +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 9A22468C404 for ; Mon, 21 Aug 2023 23:45:48 +0300 (EEST) Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-4fe27849e6aso5680500e87.1 for ; Mon, 21 Aug 2023 13:45:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692650748; x=1693255548; 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=RwrCLM+Xm3bt80Hb34ktn7tX6+HVdgiHQleR5U2hkD0=; b=ol3bILi00n9J94A7HQ/4qMhguhKp1v+YwcvaYyDqsWMJZ4UIkpa5sZhKb0OGDuSInl ZUGoHZKyqFBmfJMVekSyaKmJCFrBdCz93MOfZR8aaLIEVkOJY3giFsL43wVOosVIZY+8 S7Y9McdJm4rYVwrJr/H/7X4P3QwxLRjzQXvClGO1peA5PKiT3vl6cah/2W9WCArVmPG5 QXFf9BGCaDB10oil7+kcFEQmUtfSZm3K9FQSpdZtSj3pXnHEjbHpSoCu3uShsw1AW+ON shwg9t4MFSx4McbFlwuDLLL6yVGVP+EFTlCVb0tnVzVulOaQz/tOYcJ5zNQSlVt7IMe3 ohRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692650748; x=1693255548; 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=RwrCLM+Xm3bt80Hb34ktn7tX6+HVdgiHQleR5U2hkD0=; b=fmjVUfuq9zjdYz0SuFj/GmrP1ZmxPqJGWyQ0LByigfiJzFG4V1LYXL++XjR5emUmH1 CawA+Hvw+15mgzw98RiHgxUnyoOwkh+eASkBzhwZZrrcnbQ3NWpAFnKZS59q6kcXRB6Q UuxcRG/mO3PuKx1Yd7W5QCbp5mYc2gobjFbyOr/8sHsBqejLx4rkoGn3MRw1/SR1SeuJ iCV04mXKCSCzru4N08u5eU8L53P0CCoQou4rk2LO0O7QMCFYNG/yrlG1urTJl8sYzkM9 QHxTOQXET865nreJKBst62HYB1fRDpsIaDulwwRvPRdeX4CZDIfRYmINXKnN6f0PxKWb mpqg== X-Gm-Message-State: AOJu0Yx6NvzTPHvdrnk8dhVQnhVkqaZ4DHbfFGCLE5OG/ElhctAK3dzq m3vlCK8rG0GXTLhCvdq/WOtXLe6TfkwCicPx X-Received: by 2002:a05:6512:3e18:b0:4f8:770f:1b08 with SMTP id i24-20020a0565123e1800b004f8770f1b08mr5955560lfv.13.1692650747365; Mon, 21 Aug 2023 13:45:47 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 13:45:46 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Aug 2023 22:45:27 +0200 Message-Id: <20230821204527.4494-5-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230821204527.4494-1-epirat07@gmail.com> References: <20230724214727.40253-1-epirat07@gmail.com> <20230821204527.4494-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 5/5] lavfi/vf_xfade_vulkan: add wipes 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: 3GQTSAsKDhPO Add the wipetl, wipetr, wipebl, wipebr effects. --- libavfilter/vf_xfade_vulkan.c | 60 +++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/libavfilter/vf_xfade_vulkan.c b/libavfilter/vf_xfade_vulkan.c index 283a8e0710..fdad8c913d 100644 --- a/libavfilter/vf_xfade_vulkan.c +++ b/libavfilter/vf_xfade_vulkan.c @@ -81,6 +81,10 @@ enum XFadeTransitions { CIRCLECLOSE, DISSOLVE, PIXELIZE, + WIPETL, + WIPETR, + WIPEBL, + WIPEBR, NB_TRANSITIONS, }; @@ -246,6 +250,54 @@ static const char transition_pixelize[] = { C(0, } ) }; +static const char transition_wipetl[] = { + C(0, void transition(int idx, ivec2 pos, float progress) ) + C(0, { ) + C(1, ivec2 size = imageSize(output_images[idx]); ) + C(1, float zw = size.x * (1.0 - progress); ) + C(1, float zh = size.y * (1.0 - progress); ) + 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, (pos.y <= zh && pos.x <= zw) ? a : b); ) + C(0, } ) +}; + +static const char transition_wipetr[] = { + C(0, void transition(int idx, ivec2 pos, float progress) ) + C(0, { ) + C(1, ivec2 size = imageSize(output_images[idx]); ) + C(1, float zw = size.x * (progress); ) + C(1, float zh = size.y * (1.0 - progress); ) + 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, (pos.y <= zh && pos.x > zw) ? a : b); ) + C(0, } ) +}; + +static const char transition_wipebl[] = { + C(0, void transition(int idx, ivec2 pos, float progress) ) + C(0, { ) + C(1, ivec2 size = imageSize(output_images[idx]); ) + C(1, float zw = size.x * (1.0 - progress); ) + C(1, float zh = size.y * (progress); ) + 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, (pos.y > zh && pos.x <= zw) ? a : b); ) + C(0, } ) +}; + +static const char transition_wipebr[] = { + C(0, void transition(int idx, ivec2 pos, float progress) ) + C(0, { ) + C(1, ivec2 size = imageSize(output_images[idx]); ) + C(1, float zw = size.x * (progress); ) + C(1, float zh = size.y * (progress); ) + 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, (pos.y > zh && pos.x > zw) ? a : b); ) + C(0, } ) +}; + static const char* transitions_map[NB_TRANSITIONS] = { [FADE] = transition_fade, [WIPELEFT] = transition_wipeleft, @@ -260,6 +312,10 @@ static const char* transitions_map[NB_TRANSITIONS] = { [CIRCLECLOSE] = transition_circleclose, [DISSOLVE] = transition_dissolve, [PIXELIZE] = transition_pixelize, + [WIPETL] = transition_wipetl, + [WIPETR] = transition_wipetr, + [WIPEBL] = transition_wipebl, + [WIPEBR] = transition_wipebr, }; static av_cold int init_vulkan(AVFilterContext *avctx) @@ -614,6 +670,10 @@ static const AVOption xfade_vulkan_options[] = { { "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" }, { "pixelize", "pixelize transition", 0, AV_OPT_TYPE_CONST, {.i64=PIXELIZE}, 0, 0, FLAGS, "transition" }, + { "wipetl", "wipe top left transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPETL}, 0, 0, FLAGS, "transition" }, + { "wipetr", "wipe top right transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPETR}, 0, 0, FLAGS, "transition" }, + { "wipebl", "wipe bottom left transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEBL}, 0, 0, FLAGS, "transition" }, + { "wipebr", "wipe bottom right transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEBR}, 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 }