From patchwork Thu May 19 13:47:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 35831 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp80324pzb; Thu, 19 May 2022 06:48:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcpYP0cpq4ZWrSaZWFH3gMsNVoJYX/r1lDKfiqD/xDsap0leI/d62AcqPF1sh+XTrdBbpS X-Received: by 2002:aa7:cb48:0:b0:42a:addf:4bf1 with SMTP id w8-20020aa7cb48000000b0042aaddf4bf1mr5496324edt.283.1652968100765; Thu, 19 May 2022 06:48:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652968100; cv=none; d=google.com; s=arc-20160816; b=YXcH+/n4xThuUeGsKIZem0nou/HE5wd3Wnyq2XNDwHNv/lOHQOGVNxGSvyxp3zc4QA 1Ezc/Jj1iLMWitQvSVsLxNkwIq/urM4X9sRQkgNYOtmyaicZBntSJnz7COkOb8PgnxAs HIeC5Ii1AVq7netWug05CLnjC/h9KIox0w3u2LOzEnA8e073gJgG7JCRGPZJd4c+dNis 5zf2TC+wAw4DfS0LFVm80OjICAWMf/UBiqgUE4jg8EM75lfwfNOiAEfpxhmCR802eF5e vMctTMAC0nxcgJ1tjrwGXietXIxkRFjYL8+PX5gXHmqwuj4AH0P2ecV9NaYnqNJfvR0+ tT9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=ECNf3vy7mKxtanTDuYxyNI0lFMz7vxvbQaaDB+NF+Qw=; b=fxFsnKad9VBpe7XQwylq8eViQw/AHvgAO2h0P0obWtyo+EkvK9YH6CwJ9oPI8uatSh 6A2jIrWAJN2SN2EVvz0uGtWt/KjMkHzkO1su8ehFOEV8vN7z/+mgZWB11LhMoYiVVAT2 mFERUIRASxlDIaqFvhal3BmwLIyeo2A+cNl5bjPO8lEXMM9QNn5fLJMo7lDdcQaBzFnt wY2+63FJr5exDpmiAhW0gyjO5qZIegRuy3zgG0yfweVAFZ/FB2dgnu21l9VHOPYJxack qmeUwMSVuUSoCB81ag9bbtbVbyv6yqsyUOKlmOlwt5O9FcSA1X/EfeTPGp/pkwugf6Vy T6fw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hc16-20020a170907169000b006e7f47d22a9si6824677ejc.434.2022.05.19.06.48.20; Thu, 19 May 2022 06:48: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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3929E680374; Thu, 19 May 2022 16:47:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF22D68B49C for ; Thu, 19 May 2022 16:47:39 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 5875324017E for ; Thu, 19 May 2022 15:47:39 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id IWwdn6zLPLRe for ; Thu, 19 May 2022 15:47:36 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 8E08A240179 for ; Thu, 19 May 2022 15:47:36 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 6C0113A0337; Thu, 19 May 2022 15:47:36 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 May 2022 15:47:26 +0200 Message-Id: <20220519134728.15354-2-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220519134728.15354-1-anton@khirnov.net> References: <20220519134728.15354-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] lavfi/vf_v360: factorize vector computation for barrelsplit 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qX0ZYafOEQKH --- libavfilter/vf_v360.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index 8f36d207c9..620a995733 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -3765,6 +3765,7 @@ static int barrelsplit_to_xyz(const V360Context *s, const float scaleh = s->fout_pad > 0 ? 1.f - s->fout_pad / (height / 4.f) : 1.f - s->out_pad; const int face = floorf(y * 4.f); + const float dir_vert = (face == 1 || face == 3) ? 1.0f : -1.0f; float uf, vf; uf = x * 3.f - 2.f; @@ -3774,36 +3775,23 @@ static int barrelsplit_to_xyz(const V360Context *s, vf = y * 2.f; uf = 1.f - uf; vf = 0.5f - vf; - - l_x = (0.5f - uf) / scalew; - l_y = -0.5f; - l_z = (0.5f - vf) / scaleh; break; case 1: vf = y * 2.f; uf = 1.f - uf; vf = 1.f - (vf - 0.5f); - - l_x = (0.5f - uf) / scalew; - l_y = 0.5f; - l_z = (-0.5f + vf) / scaleh; break; case 2: vf = y * 2.f - 0.5f; vf = 1.f - (1.f - vf); - - l_x = (0.5f - uf) / scalew; - l_y = -0.5f; - l_z = (0.5f - vf) / scaleh; break; case 3: vf = y * 2.f - 1.5f; - - l_x = (0.5f - uf) / scalew; - l_y = 0.5f; - l_z = (-0.5f + vf) / scaleh; break; } + l_x = (0.5f - uf) / scalew; + l_y = 0.5f * dir_vert; + l_z = (vf - 0.5f) * dir_vert / scaleh; } vec[0] = l_x;