From patchwork Fri Mar 19 09:46:04 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: 26482 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 C3CE144984D for ; Fri, 19 Mar 2021 11:46:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 96D7368A5DF; Fri, 19 Mar 2021 11:46:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CCF768804D for ; Fri, 19 Mar 2021 11:46:12 +0200 (EET) Received: by mail-pl1-f179.google.com with SMTP id f17so2702682plr.0 for ; Fri, 19 Mar 2021 02:46:11 -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=IzTFSxIuZUryI9LfZstcF3C9+COvFuyq50Slf8WWdFI=; b=jYpe+RnpEdFKBPjFfKk0YRk95SNoAVXVVk+UtbC4PRnR4guTwx52OiLfED4Fdu9yAO 6d1/3OsW7190t3Hq09vmkYommqNH7fN9ooSGKONCLdf8I9q1CBq76/YDivg5Q59bvB0Z PYDElvr7ajYPxJC0Ei2JbzaBLpUdXXrOJ8rUmiMmTsHCK0xVcI/xfx6cgIoIcx5e4FM7 6KGzx9OFfdDOj5ddPYBO/ht8X9WeyLcOu7Ohf4ooxTDrgyEm3s5LEJoG1+T/9SBj+nEZ HIj3/wI78/ghmL/uAS7qjdNoxwSHI2Be4i4kRZ++rCVL6bOW79Lq3WS5FxXvScPn9UDb apwg== 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=IzTFSxIuZUryI9LfZstcF3C9+COvFuyq50Slf8WWdFI=; b=sx4hvownVGZO6XfzD9s5er8jWbP+mvs5o+47YnkI/MJzKvDKXHxfFIH7UmHgbx9GBB 2kQNjZw7f2t7eHPn+UE62Ff44ItOL1veMAgvvo8dWGGcUMlOgEhZBq+cWJdHwQrpHl7R umCIDaB9tlZmpHIJcdAbZr/xtIxPo32RG5f4rSn7n7rJ9UgyWHWzbeKRN38Bbh4EYhiG MkMIOsmeCnj95y8Wz7OQepvS2+9M3JliafoePS6vwLpalpxlZZtS/1znF2KSsQL0hssL yxZob7cQFDpLaBPLU58+tC/5q2LiSUtpwudv2H/XpffgefmI2eZrD4bKVWgrf4BtdRCD CeMw== X-Gm-Message-State: AOAM533ytBUFhkVdp+2uex7TS88xzzhLdwTBF6b5NyXumJrVlKWvuVWI Ze+G3XE0klPpnf67frRPM407PJlXzdm+Bw== X-Google-Smtp-Source: ABdhPJxjrj6XhmlOukmZEN4deq8JT8OrNbJz2brdowOE16OMs508s+LwPU2wRz/Wlj7JjRhR4w5i2A== X-Received: by 2002:a17:90b:3587:: with SMTP id mm7mr8763926pjb.21.1616147170342; Fri, 19 Mar 2021 02:46:10 -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 c24sm4998815pfi.193.2021.03.19.02.46.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 02:46:09 -0700 (PDT) From: Daniel Playfair Cal To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 20:46:04 +1100 Message-Id: <20210319094604.927121-1-daniel.playfair.cal@gmail.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] vf_v360: stop doubling width 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 resulted in the default aspect ratio being doubled relative to most input formats like flat/rectilinear. After this patch the default aspect ratio is the same as a rectilinear input. Signed-off-by: Daniel Playfair Cal --- libavfilter/vf_v360.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index 94473cd5b3..3d01df4cf3 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -4365,7 +4365,7 @@ static int config_output(AVFilterLink *outlink) case FISHEYE: s->in_transform = xyz_to_fisheye; err = prepare_fisheye_in(ctx); - wf = w * 2; + wf = w; hf = h; break; case PANNINI: @@ -4513,7 +4513,7 @@ static int config_output(AVFilterLink *outlink) case FISHEYE: s->out_transform = fisheye_to_xyz; prepare_out = prepare_fisheye_out; - w = lrintf(wf * 0.5f); + w = lrintf(wf); h = lrintf(hf); break; case PANNINI: