{"id":16479,"url":"https://patchwork.libcamera.org/api/1.1/patches/16479/?format=json","web_url":"https://patchwork.libcamera.org/patch/16479/","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":"<20220630133902.321099-22-jacopo@jmondi.org>","date":"2022-06-30T13:39:00","name":"[libcamera-devel,v3,21/23] ipa: ipu3: Add and use LensFocusAbsolute control","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"f2d019e8d679dd1e5a4be8483b165cb14e06c63f","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16479/mbox/","series":[{"id":3238,"url":"https://patchwork.libcamera.org/api/1.1/series/3238/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3238","date":"2022-06-30T13:38:39","name":"Internal controls, sensor delays and IPA rework","version":3,"mbox":"https://patchwork.libcamera.org/series/3238/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16479/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16479/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 983F3C3273\n\tfor ;\n\tThu, 30 Jun 2022 13:39:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F336F656AF;\n\tThu, 30 Jun 2022 15:39:55 +0200 (CEST)","from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F223E65650\n\tfor ;\n\tThu, 30 Jun 2022 15:39:50 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 01590240007;\n\tThu, 30 Jun 2022 13:39:48 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656596396;\n\tbh=oJGDA59ynjCnTwfOvPazRfGrA9ltGSrJ9yJbKPytX8c=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=1bjVYOHCdrDMKvKx9jG6cswhvcRf+8nZK4XnGAF0cia+dEA9ArdcbeadPjGsW/xZW\n\tDExEIB/77m349MbFHuGwDH1kkXpPt9NrR8FCTxOQm1wjP173t+tTXGxK8qFbQsKtWS\n\tP2/tN9xf91+8kKrfIfBb04+gfHuq24mfgtRg/sQod325NO6iVcyPM8qniS0St1Wbzg\n\ttW5d3KDnaUJLq/HKdtfwfCGup+cUaavHJzzlNA//lPiT9Gand4JA/tOomwr9hfBJKX\n\t76Srqi9Yewd33PUcovpMKdym+mB4lPiGRjg5amc/5052SjkM1tnjOp9uSuymAkBe4+\n\tZcTpDagdmwZwA==","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 30 Jun 2022 15:39:00 +0200","Message-Id":"<20220630133902.321099-22-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.36.1","In-Reply-To":"<20220630133902.321099-1-jacopo@jmondi.org>","References":"<20220630133902.321099-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 21/23] ipa: ipu3: Add and use\n\tLensFocusAbsolute control","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 ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add to the internal controls LensFocusAbsolute as a draft control\nas it is currently identical to V4L2_CID_FOCUS_ABSOLUTE.\n\nUse the newly introduced control in the IPU3 pipeline handler and IPA\nmodule.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/ipa/ipu3.mojom | 3 +--\n src/ipa/ipu3/ipu3.cpp | 7 ++-----\n src/libcamera/internal_control_ids.yaml | 13 +++++++++++++\n src/libcamera/pipeline/ipu3/ipu3.cpp | 13 +++++--------\n 4 files changed, 21 insertions(+), 15 deletions(-)","diff":"diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom\nindex 64fe65fdd5fc..bfeadc58c52a 100644\n--- a/include/libcamera/ipa/ipu3.mojom\n+++ b/include/libcamera/ipa/ipu3.mojom\n@@ -35,8 +35,7 @@ interface IPAIPU3Interface {\n };\n \n interface IPAIPU3EventInterface {\n-\tsetSensorControls(uint32 frame, libcamera.ControlList sensorControls,\n-\t\t\t libcamera.ControlList lensControls);\n+\tsetSensorControls(uint32 frame, libcamera.ControlList sensorControls);\n \tparamsBufferReady(uint32 frame);\n \tmetadataReady(uint32 frame, libcamera.ControlList metadata);\n };\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 6d622b4c290b..2f158df367a8 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -541,12 +541,9 @@ void IPAIPU3::setControls(unsigned int frame, const IPAActiveState &state)\n \tControlList ctrls(controls::internal::controls);\n \tctrls.set(controls::internal::ExposureTime, state.agc.exposure);\n \tctrls.set(controls::internal::AnalogueGain, static_cast(state.agc.gain));\n+\tctrls.set(controls::internal::draft::LensFocusAbsolute, state.af.focus);\n \n-\tControlList lensCtrls(controls::controls);\n-\tlensCtrls.set(V4L2_CID_FOCUS_ABSOLUTE,\n-\t\t static_cast(state.af.focus));\n-\n-\tsetSensorControls.emit(frame, ctrls, lensCtrls);\n+\tsetSensorControls.emit(frame, ctrls);\n }\n \n } /* namespace ipa::ipu3 */\ndiff --git a/src/libcamera/internal_control_ids.yaml b/src/libcamera/internal_control_ids.yaml\nindex 6d3775afcf67..804c227213a7 100644\n--- a/src/libcamera/internal_control_ids.yaml\n+++ b/src/libcamera/internal_control_ids.yaml\n@@ -24,4 +24,17 @@ controls:\n description: |\n The sensor analogue gain value.\n \n+ # ----------------------------------------------------------------------------\n+ # Draft controls section\n+\n+ - LensFocusAbsolute:\n+ type: int32_t\n+ draft: true\n+ description: |\n+ This control sets the focal point of the camera to the specified\n+ position. The unit is undefined. Positive values set the focus closer to\n+ the camera, negative values towards infinity.\n+\n+ Currently identical to V4L2_CID_FOCUS_ABSOLUTE.\n+\n ...\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 55b96137f065..1dbcdd0b56e6 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -86,8 +86,7 @@ public:\n private:\n \tvoid metadataReady(unsigned int id, const ControlList &metadata);\n \tvoid paramsBufferReady(unsigned int id);\n-\tvoid setSensorControls(unsigned int id, const ControlList &sensorControls,\n-\t\t\t const ControlList &lensControls);\n+\tvoid setSensorControls(unsigned int id, const ControlList &sensorControls);\n };\n \n class IPU3CameraConfiguration : public CameraConfiguration\n@@ -1247,8 +1246,7 @@ int IPU3CameraData::loadIPA()\n }\n \n void IPU3CameraData::setSensorControls([[maybe_unused]] unsigned int id,\n-\t\t\t\t const ControlList &sensorControls,\n-\t\t\t\t const ControlList &lensControls)\n+\t\t\t\t const ControlList &sensorControls)\n {\n \tCameraSensor *sensor = cio2_.sensor();\n \n@@ -1258,12 +1256,11 @@ void IPU3CameraData::setSensorControls([[maybe_unused]] unsigned int id,\n \tif (!focusLens)\n \t\treturn;\n \n-\tif (!lensControls.contains(V4L2_CID_FOCUS_ABSOLUTE))\n+\tif (!sensorControls.contains(controls::internal::draft::LensFocusAbsolute))\n \t\treturn;\n \n-\tconst ControlValue &focusValue = lensControls.get(V4L2_CID_FOCUS_ABSOLUTE);\n-\n-\tfocusLens->setFocusPosition(focusValue.get());\n+\tint32_t focusAbsolute = sensorControls.get(controls::internal::draft::LensFocusAbsolute);\n+\tfocusLens->setFocusPosition(focusAbsolute);\n }\n \n void IPU3CameraData::paramsBufferReady(unsigned int id)\n","prefixes":["libcamera-devel","v3","21/23"]}