[{"id":26739,"web_url":"https://patchwork.libcamera.org/comment/26739/","msgid":"<20230324154304.boljyfx3hbn7ucra@uno.localdomain>","date":"2023-03-24T15:43:04","subject":"Re: [libcamera-devel] [PATCH v5 09/10] rkisp1: Control camera lens\n\tposition from IPA","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"Hi Daniel\n\nOn Fri, Mar 24, 2023 at 03:29:07PM +0100, Daniel Semkowicz via libcamera-devel wrote:\n> Allow control of lens position from the IPA, by setting corresponding\n> af fields in the IPAFrameContext structure. Controls are then passed to\n> the pipeline handler, which sets the lens position in CameraLens.\n>\n> Signed-off-by: Daniel Semkowicz \n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> include/libcamera/ipa/rkisp1.mojom | 1 +\n> src/ipa/rkisp1/rkisp1.cpp | 8 ++++++++\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 13 +++++++++++++\n> 3 files changed, 22 insertions(+)\n>\n> diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\n> index bf6e9141..c3ed87aa 100644\n> --- a/include/libcamera/ipa/rkisp1.mojom\n> +++ b/include/libcamera/ipa/rkisp1.mojom\n> @@ -39,5 +39,6 @@ interface IPARkISP1Interface {\n> interface IPARkISP1EventInterface {\n> \tparamsBufferReady(uint32 frame);\n> \tsetSensorControls(uint32 frame, libcamera.ControlList sensorControls);\n> +\tsetLensControls(libcamera.ControlList lensControls);\n> \tmetadataReady(uint32 frame, libcamera.ControlList metadata);\n> };\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 4b30844f..4aef2e30 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -469,6 +469,14 @@ void IPARkISP1::setControls(unsigned int frame)\n> \tctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast(gain));\n>\n> \tsetSensorControls.emit(frame, ctrls);\n> +\n> +\tif (lensControls_ && context_.activeState.af.applyLensCtrls) {\n> +\t\tcontext_.activeState.af.applyLensCtrls = false;\n> +\t\tControlList lensCtrls(*lensControls_);\n> +\t\tlensCtrls.set(V4L2_CID_FOCUS_ABSOLUTE,\n> +\t\t\t context_.activeState.af.lensPosition);\n> +\t\tsetLensControls.emit(lensCtrls);\n> +\t}\n> }\n>\n> } /* namespace ipa::rkisp1 */\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 83fb6287..b6eef541 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -114,6 +114,7 @@ private:\n> \tvoid paramFilled(unsigned int frame);\n> \tvoid setSensorControls(unsigned int frame,\n> \t\t\t const ControlList &sensorControls);\n> +\tvoid setLensControls(const ControlList &lensControls);\n>\n> \tvoid metadataReady(unsigned int frame, const ControlList &metadata);\n> };\n> @@ -340,6 +341,8 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\n> \t\treturn -ENOENT;\n>\n> \tipa_->setSensorControls.connect(this, &RkISP1CameraData::setSensorControls);\n> +\tif (sensor_->focusLens())\n> +\t\tipa_->setLensControls.connect(this, &RkISP1CameraData::setLensControls);\n> \tipa_->paramsBufferReady.connect(this, &RkISP1CameraData::paramFilled);\n> \tipa_->metadataReady.connect(this, &RkISP1CameraData::metadataReady);\n>\n> @@ -403,6 +406,16 @@ void RkISP1CameraData::setSensorControls([[maybe_unused]] unsigned int frame,\n> \tdelayedCtrls_->push(sensorControls);\n> }\n>\n> +void RkISP1CameraData::setLensControls(const ControlList &lensControls)\n> +{\n> +\tCameraLens *focusLens = sensor_->focusLens();\n> +\n> +\tfor (auto const &[id, value] : lensControls) {\n> +\t\tif (id == V4L2_CID_FOCUS_ABSOLUTE)\n> +\t\t\tfocusLens->setFocusPosition(value.get());\n> +\t}\n> +}\n> +\n> void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &metadata)\n> {\n> \tRkISP1FrameInfo *info = frameInfo_.find(frame);\n> --\n> 2.39.2\n>","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 28661C0F2A\n\tfor ;\n\tFri, 24 Mar 2023 15:43:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D790262712;\n\tFri, 24 Mar 2023 16:43:08 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 93EC861ECF\n\tfor ;\n\tFri, 24 Mar 2023 16:43:07 +0100 (CET)","from ideasonboard.com (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3640EAFD;\n\tFri, 24 Mar 2023 16:43:07 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1679672588;\n\tbh=we0XRToRzLzdhM1g68zC7k/RCNF1Jz/evZlQioxZYuA=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=OnZIELgLjk73BRNihpJQ5RiW9rvoDyrxpNfwuWZXtxl4tLkx2Q7Nns9K1KtCSuIF9\n\tCAOQTcIpECCGkU/jgKuDBDGDn3k1rwU8yuVy1xQS9i+PsemxusTbYcYXUAFwyQRDdf\n\t7tLJwiTLIcfDPsBtSzj5UH+8FzCd2ncsbGVyQcrJkHPT/hyv575hQZ1KLkkZJ4ZEGs\n\thkHg5+2XBlPW7X109eZi0glyMfqDYwBEdC2LK/27dMjspy4kgTCQOwM3cR4KEd2D49\n\t2EeDMJDQgAYsMjeu2hzSwva36cxKopYAnqBBesWQORpkpPSf9AKmZ+0OSmucD104Bd\n\tIFyVEAdGy6wuQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1679672587;\n\tbh=we0XRToRzLzdhM1g68zC7k/RCNF1Jz/evZlQioxZYuA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=XGS+GTNcO1Ot9X8fFIIE0CJPejCqwsBtUbMvBGhuiA1RvkupskL6xihZ+bnueCA69\n\tht1QVp2W7Z0oj0UFljmJA9I4sojx8Z1rcprvaqFbPGgAoG/fYOvTUuRynOJgXUYanL\n\tFifQAEivUNgaU5QfkwLaPmO+0KYIn1tCozdSBQxI="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"XGS+GTNc\"; dkim-atps=neutral","Date":"Fri, 24 Mar 2023 16:43:04 +0100","To":"Daniel Semkowicz ","Message-ID":"<20230324154304.boljyfx3hbn7ucra@uno.localdomain>","References":"<20230324142908.64224-1-dse@thaumatec.com>\n\t<20230324142908.64224-10-dse@thaumatec.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20230324142908.64224-10-dse@thaumatec.com>","Subject":"Re: [libcamera-devel] [PATCH v5 09/10] rkisp1: Control camera lens\n\tposition from IPA","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","From":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Cc":"jacopo.mondi@ideasonboard.com, libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]