{"id":15457,"url":"https://patchwork.libcamera.org/api/patches/15457/?format=json","web_url":"https://patchwork.libcamera.org/patch/15457/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20220316093951.33779-1-jeanmichel.hautbois@ideasonboard.com>","date":"2022-03-16T09:39:50","name":"[libcamera-devel,1/2] libcamera: raspberrypi: Control the lens from pipeline","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c2d581232e35c440b46c7bff080bf5983e2def43","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/?format=json","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15457/mbox/","series":[{"id":2966,"url":"https://patchwork.libcamera.org/api/series/2966/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2966","date":"2022-03-16T09:39:50","name":"[libcamera-devel,1/2] libcamera: raspberrypi: Control the lens from pipeline","version":1,"mbox":"https://patchwork.libcamera.org/series/2966/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15457/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15457/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\r\n\t[92.243.16.209])\r\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 3C92BBDE17\r\n\tfor ;\r\n\tWed, 16 Mar 2022 09:39:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\r\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 72DCA6118A;\r\n\tWed, 16 Mar 2022 10:39:57 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\r\n\t[213.167.242.64])\r\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B5973601F5\r\n\tfor ;\r\n\tWed, 16 Mar 2022 10:39:55 +0100 (CET)","from tatooine.ideasonboard.com (unknown\r\n\t[IPv6:2a01:e0a:169:7140:3036:4976:879c:5c94])\r\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4ADFDDD;\r\n\tWed, 16 Mar 2022 10:39:55 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\r\n\ts=mail; t=1647423597;\r\n\tbh=px9g9m4iliZYAxgzT/60BEvKxaq7Gee9SONa57PBcUs=;\r\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\r\n\tList-Help:List-Subscribe:From:Reply-To:From;\r\n\tb=Hs/Jb7ZXNOp/TRU5eHRGDy5zjTZHD6tbW8rvqPQeKjcOCmUEluYDbaAsRyhgZ599H\r\n\tgL2lKFUbMZSK4VdWV6WJTayID8U6m/RTIMVhmUbzLbTotk7syjkDdvS71vg+IRYSSl\r\n\tCa1MFkHVu9JvVM0NO4lXiPzdx97WrEM0g7LYCejlDOnTqrfuMFnHwSFMDLVkHn+LK+\r\n\tgwIFM+jFpedzThWoaXfZTG7SSP8RakiVYUt7Ck6rS+RBICe/yIJX3l4s9WJjoAmfxw\r\n\tnO+Z5/yr/akeYJJ58m1nkJkFucmp5MgtIRuaUSbL1bBGhnKOLgSGRS3cyBhAsYpxig\r\n\tlcye8JdPvwGiQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\r\n\ts=mail; t=1647423595;\r\n\tbh=px9g9m4iliZYAxgzT/60BEvKxaq7Gee9SONa57PBcUs=;\r\n\th=From:To:Cc:Subject:Date:From;\r\n\tb=DZfqhMt6Y4eKpdQHzifJL0w8HU5K+EL6A7INXYBTMCZJYjcMlSIXE20UvXqSTxea4\r\n\tPZnhV9yE6Kgqnh7hNe6JSdhnhJCa7328cmGjGb3eloA6D2ZeFAM3/VrIkRK1AoYG4A\r\n\tBRQnn5iknirS9WAMnW6DihDZ9D5tYclrJRxx2eDI="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \r\n\tunprotected) header.d=ideasonboard.com\r\n\theader.i=@ideasonboard.com\r\n\theader.b=\"DZfqhMt6\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 16 Mar 2022 10:39:50 +0100","Message-Id":"<20220316093951.33779-1-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 1/2] libcamera: raspberrypi: Control the\r\n\tlens from pipeline","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\r\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\r\n\t","From":"Jean-Michel Hautbois via libcamera-devel\r\n\t","Reply-To":"Jean-Michel Hautbois ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The lens focus is controled by a VCM, which is linked to the sensor\nusing the ancillary links.\nPass the control to the config info structure and make it possible to\nupdate by the IPA.\n\nSigned-off-by: Jean-Michel Hautbois \n---\n include/libcamera/ipa/raspberrypi.mojom | 1 +\n .../pipeline/raspberrypi/raspberrypi.cpp | 15 +++++++++++++++\n 2 files changed, 16 insertions(+)","diff":"diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\r\nindex acd3cafe..0c3922b0 100644\r\n--- a/include/libcamera/ipa/raspberrypi.mojom\r\n+++ b/include/libcamera/ipa/raspberrypi.mojom\r\n@@ -125,4 +125,5 @@ interface IPARPiEventInterface {\r\n \tembeddedComplete(uint32 bufferId);\r\n \tsetIspControls(libcamera.ControlList controls);\r\n \tsetDelayedControls(libcamera.ControlList controls);\r\n+\tsetLensControls(libcamera.ControlList controls);\r\n };\r\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\r\nindex c2230199..67a98daa 100644\r\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\r\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\r\n@@ -33,6 +33,7 @@\r\n \r\n #include \"libcamera/internal/bayer_format.h\"\r\n #include \"libcamera/internal/camera.h\"\r\n+#include \"libcamera/internal/camera_lens.h\"\r\n #include \"libcamera/internal/camera_sensor.h\"\r\n #include \"libcamera/internal/delayed_controls.h\"\r\n #include \"libcamera/internal/device_enumerator.h\"\r\n@@ -202,6 +203,7 @@ public:\r\n \tvoid setIspControls(const ControlList &controls);\r\n \tvoid setDelayedControls(const ControlList &controls);\r\n \tvoid setSensorControls(ControlList &controls);\r\n+\tvoid setLensControls(const ControlList &controls);\r\n \r\n \t/* bufferComplete signal handlers. */\r\n \tvoid unicamBufferDequeue(FrameBuffer *buffer);\r\n@@ -1483,6 +1485,7 @@ int RPiCameraData::loadIPA(ipa::RPi::SensorConfig *sensorConfig)\r\n \tipa_->embeddedComplete.connect(this, &RPiCameraData::embeddedComplete);\r\n \tipa_->setIspControls.connect(this, &RPiCameraData::setIspControls);\r\n \tipa_->setDelayedControls.connect(this, &RPiCameraData::setDelayedControls);\r\n+\tipa_->setLensControls.connect(this, &RPiCameraData::setLensControls);\r\n \r\n \t/*\r\n \t * The configuration (tuning file) is made from the sensor name unless\r\n@@ -1519,6 +1522,10 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\r\n \tentityControls.emplace(0, sensor_->controls());\r\n \tentityControls.emplace(1, isp_[Isp::Input].dev()->controls());\r\n \r\n+\tCameraLens *lens = sensor_->focusLens();\r\n+\tif (lens)\r\n+\t\tentityControls.emplace(2, lens->controls());\r\n+\r\n \t/* Always send the user transform to the IPA. */\r\n \tipaConfig.transform = static_cast(config->transform);\r\n \r\n@@ -1735,6 +1742,14 @@ void RPiCameraData::setDelayedControls(const ControlList &controls)\r\n \thandleState();\r\n }\r\n \r\n+void RPiCameraData::setLensControls(const ControlList &controls)\r\n+{\r\n+\tControlList ctrls = controls;\r\n+\r\n+\tsensor_->focusLens()->setFocusPosition(ctrls.get(V4L2_CID_FOCUS_ABSOLUTE).get());\r\n+\thandleState();\r\n+}\r\n+\r\n void RPiCameraData::setSensorControls(ControlList &controls)\r\n {\r\n \t/*","prefixes":["libcamera-devel","1/2"]}