From patchwork Mon Nov 25 15:14:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 22067 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id DA963C32A3 for ; Mon, 25 Nov 2024 15:14:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1E57465F66; Mon, 25 Nov 2024 16:14:37 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="GDRwSyz2"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A2DC265F56 for ; Mon, 25 Nov 2024 16:14:35 +0100 (CET) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:4cf:a935:de6f:a329]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id CC5C46B5; Mon, 25 Nov 2024 16:14:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1732547653; bh=r3wA85z8+2WEj3IXuFb9LN5Vn1QrlT6CxKw7xc5yCRU=; h=From:To:Cc:Subject:Date:From; b=GDRwSyz2ZoQs473xlEVx+rDwZU7MgmNPCiSEkI1riMZVVJmQRHjw3xFr+kHp7j+wx kYjzPAHuhAMyAPT7J6484eF8S0868wmDZ59QINl9lc3usxZk1yS5cNOvAsFflHzki/ uK1oqgL2M19GkiTuZttTzwziOWi2Bl9032/lMyE4= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug Subject: [PATCH v2 0/8] rkisp1: Fix aspect ratio and ScalerCrop Date: Mon, 25 Nov 2024 16:14:09 +0100 Message-ID: <20241125151430.2437285-1-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Hi all, This series contains fixes for a few issues on the imx8mp that I'd like to get in before the next release. Patch 1/8 is a drive by fix Patch 2/8 Fixes the aspect ratio on the imx8mp. There exists code to keep the aspect ratio in the rkisp1 pipeline that adjust the input crop on the resizer stage. On the imx8mp however the resizer hardware is missing that functionality and cropping needs to be done on the ISP output. Patch 2 implements that. Patches 3-8 fix the ScalerCrop control. The existing implementation implements ScalerCrop in dewarper coordinates (After scaling down). This is incorrect as ScalerCrop is specified to be in sensor coordinates. To fix that, patches 3-6 do preparatory changes and patch 6 implements the correct ScalerCrop control. Patch 8 adds ScalerMaximumCrop for completeness sake. Note that this solution while being correct on the numbers is still not ideal, because the aspect ratio preserving crop on the ISP output is still applied unconditionally. That will get fixed in an upcoming series, where the full sensor size get's passed to the dewarper and all cropping/scaling gets handled there. Best regards, Stefan Changes in v2: - Some smaller fixes from review (see individual changelogs) - Added [PATCH v2 6/8] libcamera: converter_v4l2_m2m: Improve crop bounds support to be able to provide sane default values for ScalerCrop before configure() Stefan Klug (8): libcamera: rkisp1: Fix scope of dewarper stop() exit action libcamera: rkisp1: Keep aspect ratio on imx8mp libcamera: geometry: Add Rectangle::transformedBetween() pipeline: rkisp1: Split inputCrop and outputCrop pipeline: rkisp1: Reorder sensorInfo collection code libcamera: converter_v4l2_m2m: Improve crop bounds support pipeline: rkisp1: Fix ScalerCrop to be in sensor coordinates pipeline: rkisp1: Add ScalerMaximumCrop property include/libcamera/geometry.h | 3 + .../internal/converter/converter_v4l2_m2m.h | 1 + src/libcamera/converter.cpp | 3 + .../converter/converter_v4l2_m2m.cpp | 113 +++++++++--------- src/libcamera/geometry.cpp | 37 ++++++ src/libcamera/pipeline/rkisp1/rkisp1.cpp | 99 +++++++++++---- src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 13 +- 7 files changed, 182 insertions(+), 87 deletions(-)