From patchwork Sun Mar 21 12:44:11 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: 26518 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 9F79F4499F7 for ; Sun, 21 Mar 2021 14:45:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E9D568A7DD; Sun, 21 Mar 2021 14:45:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF56668A7D9 for ; Sun, 21 Mar 2021 14:45:02 +0200 (EET) Received: by mail-pj1-f53.google.com with SMTP id kk2-20020a17090b4a02b02900c777aa746fso7111402pjb.3 for ; Sun, 21 Mar 2021 05:45:02 -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=cIoOs/0iZrH0FQKcSmFQAHQM1V3uzSunxN9CeL1aJmLmqJa01aUwhwYuh0UnTA7NxC MYQJDB+eK5pNbrtinMHWI1b4OnyK1eWUgUygQoNhuakjnZvp56+XlA8jQ7YGTVL8G99h bTVx2PGPT5dioSA7hV5/jlmPefPkIDufdIhXkxsjB5QsGuhGfKjsg8aRWDhfdMg7iTMP v+d6W4JnMaL6FEqp9vhRJSWK9Ed1fWeF+MfYWuSkm5yZ4QTc0Q0SdqzyqwUwBtC8Lokr ZmAsIX8z0rgxBohrcrkRhgENhNzv+KaiXgDKcd+Jfd5JG1XLzqUBwQahvOQK+K3h43I8 0zmg== 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=jK5obNlFYkqFjMvyJJyCLzgw3IHZQy4Y5Ks/dR2ljCN5F0jl+q9hj/L294Lvu30sDe 1MzC532ZY1UORqi8mFg/ARMYmepyCFOSpE41ZDyfZpAqC5FdJtftlnTmvp+pCxvdGRuf 79mABiXXS9qLQNYlpmIB2jUN45UGCa57EMShb/0wpFshHwzagzIIsjQOafH7jI0prarp HxsiZUjxQ9bGlwMHsLPZzJ21vEnDZ6pcCVzN1ATYtp8GhHEn1y1nT8YgOYpSThnSnNys IiFe8hOvXH6ntlCBLQsjHtlHWcfu64zqVZ83UrKgAupbHu1Gbi+g4aGuqTookT1Y013F ghaQ== X-Gm-Message-State: AOAM533egq5hQVWFQiN/vhwQ5SpizsUWD9rWqOFuizIT7IHwgaeFn6cI 0m1a6jn3EC3NlBAufDqGvQPvzKbjttpvVQ== X-Google-Smtp-Source: ABdhPJxEWqPsmDRYvZqg9p/KoAPPbN98tKE9WiRCJbB9FE3zjypsHCbFg45cM7+Y7KqbfQX/L52+oQ== X-Received: by 2002:a17:902:da92:b029:e5:fa64:e9f3 with SMTP id j18-20020a170902da92b02900e5fa64e9f3mr22105682plx.54.1616330700637; Sun, 21 Mar 2021 05:45:00 -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 x11sm13334158pjh.0.2021.03.21.05.44.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Mar 2021 05:45:00 -0700 (PDT) From: Daniel Playfair Cal To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Mar 2021 23:44:11 +1100 Message-Id: <20210321124414.1223626-1-daniel.playfair.cal@gmail.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avfilter/vf_v360: fix fov_from_hfov for fisheye 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: