{"id":22356,"url":"https://patchwork.libcamera.org/api/1.1/patches/22356/?format=json","web_url":"https://patchwork.libcamera.org/patch/22356/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20241216154124.203650-11-stefan.klug@ideasonboard.com>","date":"2024-12-16T15:40:50","name":"[v4,10/20] pipeline: rkisp1: Query dewarper crop bounds if no stream configured","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"5cf8988e314030517eab0d2ebd29caaf50260af5","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22356/mbox/","series":[{"id":4896,"url":"https://patchwork.libcamera.org/api/1.1/series/4896/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4896","date":"2024-12-16T15:40:40","name":"rkisp1: Fix aspect ratio and ScalerCrop","version":4,"mbox":"https://patchwork.libcamera.org/series/4896/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22356/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22356/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 5516FC32F6\n\tfor ;\n\tMon, 16 Dec 2024 15:42:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 091C467F8D;\n\tMon, 16 Dec 2024 16:42:17 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D0B3967F8B\n\tfor ;\n\tMon, 16 Dec 2024 16:42:13 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:bfdf:3a3c:e45:66e3])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 445EE675;\n\tMon, 16 Dec 2024 16:41:37 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"KaQ5biGI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1734363697;\n\tbh=ndmsJHnTDuyPLgB4S2I/qzI52TKDwhBOhXbSsAeTVd0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=KaQ5biGIJe5b6aBHVHSoX6InDR8/Mm71nKbENTXpAWIhIHvxE8+u+mMm7YVAE4Qjk\n\tQHeBGI6eiT0v5bdD4O6SLFujkg5aYM2+EkaR0FAQmDLi99UO5ywKI6MUkB9idIrj//\n\tTPe1JlJoSB2bIbDG+n/BfT8YxglPYXJ4Di9llqnM=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[PATCH v4 10/20] pipeline: rkisp1: Query dewarper crop bounds if no\n\tstream configured","Date":"Mon, 16 Dec 2024 16:40:50 +0100","Message-ID":"<20241216154124.203650-11-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20241216154124.203650-1-stefan.klug@ideasonboard.com>","References":"<20241216154124.203650-1-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Query the crop bounds on the dewarper instead of the stream in case the\ncamera was not yet configured when updateControls() gets called. This\nprovides sane defaults for the controls.\n\nSigned-off-by: Stefan Klug \n\n---\n\nChanges in v4:\n- Split patch from libcamera: converter_v4l2_m2m: Improve crop bounds\n support\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 7 +++++--\n 1 file changed, 5 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 89946b782854..56192451eb3c 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -1220,8 +1220,11 @@ int PipelineHandlerRkISP1::updateControls(RkISP1CameraData *data)\n \tControlInfoMap::Map controls;\n \n \tif (dewarper_) {\n-\t\tstd::pair cropLimits =\n-\t\t\tdewarper_->inputCropBounds(&data->mainPathStream_);\n+\t\tstd::pair cropLimits;\n+\t\tif (dewarper_->isConfigured(&data->mainPathStream_))\n+\t\t\tcropLimits = dewarper_->inputCropBounds(&data->mainPathStream_);\n+\t\telse\n+\t\t\tcropLimits = dewarper_->inputCropBounds();\n \n \t\tcontrols[&controls::ScalerCrop] = ControlInfo(cropLimits.first,\n \t\t\t\t\t\t\t cropLimits.second,\n","prefixes":["v4","10/20"]}