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 }