From patchwork Wed Nov 20 08:57:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 22029 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 A394EC330D for ; Wed, 20 Nov 2024 08:58:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 31DAC65F51; Wed, 20 Nov 2024 09:58:21 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="jPMhIorM"; 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 00AF565F30 for ; Wed, 20 Nov 2024 09:58:17 +0100 (CET) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:bbd:82cc:f3f3:e12e]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0A43755A; Wed, 20 Nov 2024 09:57:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1732093079; bh=tZphfWIhGEQeLXpOwirq4VVHqyST/gTXN1DCGq09QZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jPMhIorMjrMR3ZKgxC4L1dHPu4TG6srWU8FvNE4zAYhL/UoTcQNS8OTg4zy41nWGZ vh2z8a/7GRurdO+XPJPL1m7aqtJThNBDdV4aprJqG9PlPay2KzTfTJR3kIrz/x3ABL bIjm+MkJfxAaTwjns0f8oUg/BmAc+pBHXaMGhH50= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug Subject: [PATCH 7/7] pipeline: rkisp1: Add ScalerMaximumCrop property Date: Wed, 20 Nov 2024 09:57:46 +0100 Message-ID: <20241120085753.1993436-8-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241120085753.1993436-1-stefan.klug@ideasonboard.com> References: <20241120085753.1993436-1-stefan.klug@ideasonboard.com> 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" The ScalerMaximumCrop property holds the biggest allowed ScalerCrop value. Add it to the rkisp1. Signed-off-by: Stefan Klug --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index c2ce38b1c253..647b5754bd55 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -870,7 +871,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c) * coordinates. */ dewarperSensorCrop_ = outputCrop.mappedBetween(inputCrop, - ipaConfig.sensorInfo.analogCrop); + sensorInfo.analogCrop); } } else if (hasSelfPath_) { ret = selfPath_.configure(cfg, format); @@ -1247,6 +1248,7 @@ int PipelineHandlerRkISP1::updateControls(RkISP1CameraData *data) controls[&controls::ScalerCrop] = ControlInfo(min, max, max); + data->properties_.set(properties::ScalerCropMaximum, max); activeCrop_ = max; }