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 }