From patchwork Fri Mar 19 09:54:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Playfair Cal X-Patchwork-Id: 26484 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3D89244B007 for ; Fri, 19 Mar 2021 12:02:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 07DE268A40E; Fri, 19 Mar 2021 12:02:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE06768811B for ; Fri, 19 Mar 2021 12:01:54 +0200 (EET) Received: by mail-oi1-f182.google.com with SMTP id d12so4164453oiw.12 for ; Fri, 19 Mar 2021 03:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tr9UQ/rfcE1+A3CPuPAz70+3f70XClb9v67mDfESKBU=; b=tRCistW7OsERBGRpgKpE6yerkDKJL2i3iCqwjv0xLBnUieESDjrkEGPBgVTaKmHLHY 4DX5XXymDN2rA9FuDNUQ/Kahxzera6+jAm/l7V/49gknpaubT7O1nwh3RJd2bLj7uqH8 7/UVmHPVvbMIeO3qXmrIMd5hSI9vS90e77OrszpF4HnaJxT66xm2X3QPIqAxek3GjBBx CaZSoGk8lHfZpnO82vI/unHGrUHAxr085QdOCpMtjZ3MSFiziqXwvi5bg01yVDmoR9XB Ulxai4pL+VgwVW5H+kgj7LM9q9T810jsL3zaRRKR/fN7MgNtnz+IraTOFDeFnyt6CuUt myJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tr9UQ/rfcE1+A3CPuPAz70+3f70XClb9v67mDfESKBU=; b=XwF7trqJVSwaRikqBS6hPVoYiDhVD6FJosHd3N/e6r4UxTikXsXEVkWt8y9wamOt4K q7e5AMTg9Nk2SCVzxUpS5vevFkZExZloAwUZ/vz72Kr5+I9TCN/g9VuK9CSE9XZo/mOl eIPSmDS0RXBqF2gpgt1IMI4wIJFdBMsfXkTMrUwrwlEY/RG2A23V5DoRk4B7Viy45AmW 5RGnXfyd5Xkh4Et3IeVGi+MqBag8uelB8RKR22Re3iwkXk0MPf3CpbdmkzFarKPvL9IK w510/q2pMgc5A9Pr+6BWmkHLmKbpbw2AUx2V3VKB14Vd18eLOeVt/GfHqDk50T3fDdzq FCfg== X-Gm-Message-State: AOAM530igHaJ2mPEdI990APYsYf7M3nytbKDDut5M+jL5Ty0Io9LwZ4x I7nN+scXOuTzpDFoGCmMyJIPbRUuCLro1A== X-Google-Smtp-Source: ABdhPJyaLBf+PSzfRXg/40eTvH4peK68Jf5zubJyOJGNdbYmwuM9bi7BR3jLiRSJqpJeWEHCJW1YdA== X-Received: by 2002:a17:90a:7e8b:: with SMTP id j11mr8950576pjl.11.1616147665972; Fri, 19 Mar 2021 02:54:25 -0700 (PDT) Received: from localhost.localdomain (110-175-121-4.static.tpgi.com.au. [110.175.121.4]) by smtp.gmail.com with ESMTPSA id 197sm4993194pfc.1.2021.03.19.02.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 02:54:25 -0700 (PDT) From: Daniel Playfair Cal To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 20:54:19 +1100 Message-Id: <20210319095419.928443-1-daniel.playfair.cal@gmail.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] vf_v360: fix fov_from_hfov for fisheye projection X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Daniel Playfair Cal Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This was previously incorrect, so that passing only id_fov or d_fov resulted in incorrect transformation. Signed-off-by: Daniel Playfair Cal --- libavfilter/vf_v360.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index 94473cd5b3..425f04da94 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -4045,10 +4045,10 @@ static void fov_from_dfov(int format, float d_fov, float w, float h, float *h_fo break; case FISHEYE: { - const float d = 0.5f * hypotf(w, h); + const float d = hypotf(w, h); - *h_fov = d / w * d_fov; - *v_fov = d / h * d_fov; + *h_fov = w / d * d_fov; + *v_fov = h / d * d_fov; } break; case FLAT: