Patch Detail
Show a patch.
GET /api/1.1/patches/17164/?format=api
{ "id": 17164, "url": "https://patchwork.libcamera.org/api/1.1/patches/17164/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17164/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20220818094410.1671-10-jacopo@jmondi.org>", "date": "2022-08-18T09:44:02", "name": "[libcamera-devel,v3,09/17] rkisp1: Add camera lens to PH and expose it to the IPA", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "d26e424515df6728e4f046a100839298c84ac5b5", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17164/mbox/", "series": [ { "id": 3426, "url": "https://patchwork.libcamera.org/api/1.1/series/3426/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3426", "date": "2022-08-18T09:43:53", "name": "libcamera: Align IPU3 and RKISP1 interfaces", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3426/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17164/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17164/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 65282C3272\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 18 Aug 2022 09:44:37 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2AC0B61FC9;\n\tThu, 18 Aug 2022 11:44:37 +0200 (CEST)", "from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[IPv6:2001:4b98:dc4:8::229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8406861FC2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 18 Aug 2022 11:44:31 +0200 (CEST)", "(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id B2A12FF809;\n\tThu, 18 Aug 2022 09:44:30 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660815877;\n\tbh=y4ThQ8R3CdYDvYj3dL+c7PSBqgcv9xNuEN0eJUGqV1U=;\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=pJ7zE7KFTMI/ibFmcLhdI2guAGThCw1FrSjBWeI/gnSaTUaXVIFMhEvvSfviZcQXH\n\tlV7w0Lih/iA46JE6XHff2eP+ciHYbOio6dYhA2tAhAAHhdCeycp+KjGkzBWXtpqZR9\n\tT3ssiIinCw1EDbJy0+jPBPFYwpyH5NSaH70GdGMlMJcBXjS9FQZ5udouT4z6DGPRI7\n\tYrsoroctAl5pk1B+tbYGd9QRaRJ0NJFCPVhsE4ZE6K5VxHLDxnDsNWs99i+Xb7wIKp\n\tvKwdmHJEKCK1bXwKav2tWqeX7joUK9kgtzyXfyEN/0CfuS6mwdYZDnOkYhFo0Lzx5A\n\t+89f6lTElWPig==", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 18 Aug 2022 11:44:02 +0200", "Message-Id": "<20220818094410.1671-10-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.37.2", "In-Reply-To": "<20220818094410.1671-1-jacopo@jmondi.org>", "References": "<20220818094410.1671-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 09/17] rkisp1: Add camera lens to PH\n\tand expose it to the IPA", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Jacopo Mondi via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Jacopo Mondi <jacopo@jmondi.org>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Daniel Semkowicz via libcamera-devel <libcamera-devel@lists.libcamera.org>\n\nCheck in pipeline handler if camera lens exists, add expose its controls\nto the IPA.\n\nSigned-off-by: Daniel Semkowicz <dse@thaumatec.com>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/ipa/rkisp1/rkisp1.cpp | 6 ++++++\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 5 +++++\n 2 files changed, 11 insertions(+)", "diff": "diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 15d1a40fbb9a..3a98aaf75d98 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -7,6 +7,7 @@\n \n #include <algorithm>\n #include <math.h>\n+#include <optional>\n #include <queue>\n #include <stdint.h>\n #include <string.h>\n@@ -70,6 +71,7 @@ private:\n \tstd::map<unsigned int, MappedFrameBuffer> mappedBuffers_;\n \n \tControlInfoMap sensorCtrls_;\n+\tstd::optional<ControlInfoMap> lensCtrls_;\n \n \t/* Camera sensor controls. */\n \tbool autoExposure_;\n@@ -206,6 +208,10 @@ int IPARkISP1::configure([[maybe_unused]] const IPACameraSensorInfo &info,\n \n \tsensorCtrls_ = entityControls.at(0);\n \n+\tauto lensControls = entityControls.find(1);\n+\tif (lensControls != entityControls.end())\n+\t\tlensCtrls_ = lensControls->second;\n+\n \tconst auto itExp = sensorCtrls_.find(V4L2_CID_EXPOSURE);\n \tif (itExp == sensorCtrls_.end()) {\n \t\tLOG(IPARkISP1, Error) << \"Can't find exposure control\";\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 932873329e89..5f10c26bcb4d 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -28,6 +28,7 @@\n #include <libcamera/stream.h>\n \n #include \"libcamera/internal/camera.h\"\n+#include \"libcamera/internal/camera_lens.h\"\n #include \"libcamera/internal/camera_sensor.h\"\n #include \"libcamera/internal/delayed_controls.h\"\n #include \"libcamera/internal/device_enumerator.h\"\n@@ -694,6 +695,10 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \tstd::map<uint32_t, ControlInfoMap> entityControls;\n \tentityControls.emplace(0, data->sensor_->controls());\n \n+\tCameraLens *lens = data->sensor_->focusLens();\n+\tif (lens)\n+\t\tentityControls.emplace(1, lens->controls());\n+\n \tret = data->ipa_->configure(sensorInfo, streamConfig, entityControls);\n \tif (ret) {\n \t\tLOG(RkISP1, Error) << \"failed configuring IPA (\" << ret << \")\";\n", "prefixes": [ "libcamera-devel", "v3", "09/17" ] }