From patchwork Fri Mar 19 09:45:12 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: 26485 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 A16DE44A34B for ; Fri, 19 Mar 2021 12:13:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7FD05680BE8; Fri, 19 Mar 2021 12:13:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CE92680A4D for ; Fri, 19 Mar 2021 12:13:41 +0200 (EET) Received: by mail-oi1-f174.google.com with SMTP id x2so4195157oiv.2 for ; Fri, 19 Mar 2021 03:13:41 -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=ITE6JS1f9gm2FUD0lmvsjMuRmdosUXC5gT73h4OJrUB+MDFklaoUQRXcwcFkrtLmKI ZbieBU5I97GVCP1HzW+n86Q/N4a3LUe5YOZ3mz3kd+fkoRipp0+Jex+h7XLjFU6pF5YB IuGbQwYd9UTgPDJXck5f8hWR+gqQKYw0vs27Bi1PFhwV0jcPgRcl37GjU0EF0wSTqP21 gv7hx1wNuYjYK7iDPOmFY/OA3MomxtaMOWSjAK0sYdMWhzNORwbO3UV24A16flWSfT2c OzRMbJCyZmSQCFV9w2l9DEiltNySGvlTMmxoJqzokUgyUWygIJOZCyz5xv/S9G802NMe Ck0g== 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=JnAtTu8AH59Y/8B2lCQAHufq6iwS+4rCNXNM/NoQOFXiKKd0PbJHXdpB+ZGIgukSXS /CsiGUtQxxFIh7P49woxdJiQHIdofZoUwr8XD46XjpQrPBdmSzX6v8u6Kpyh9rxfgeFB d1x1IO6kOtjV81WXXKA3iVYix0jWTWxwwOmo0DOTLXVLga9KPvScWywERriHAwz+dc9G unJfipEmsIGadrMQ53/PDqZQ1+zpzndfAFnAjg97AhujU/Vs26Y7ycLU1Eq6JMMIsp9o IXYMjn1LAtHzgrVr1hxQAJLg4B9dJsbHTNZzCHrQThmiCWA8NbQ631HECAHBPhChST3d Y15A== X-Gm-Message-State: AOAM532v6MpkNxOIzr2Pmr8hFDk5ZHXydt8/X0GGaqpOJIgiD+6ZrYoJ bxFSINzCtZgTcOM20py4qFKjmDxyo+m++A== X-Google-Smtp-Source: ABdhPJxxhlFddBamoIFHCnDRCBQ19AnGuzmYCIUhRbLNoiEr8paCn0hIm6/GQt0Jp66NqWwUS95zMA== X-Received: by 2002:a17:90b:4c08:: with SMTP id na8mr9368054pjb.70.1616147122976; Fri, 19 Mar 2021 02:45:22 -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 197sm4958919pfc.1.2021.03.19.02.45.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 02:45:22 -0700 (PDT) From: Daniel Playfair Cal To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 20:45:12 +1100 Message-Id: <20210319094512.926746-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: