Patch Detail
Show a patch.
GET /api/patches/14553/?format=api
{ "id": 14553, "url": "https://patchwork.libcamera.org/api/patches/14553/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14553/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20211111104958.312070-2-hanlinchen@chromium.org>", "date": "2021-11-11T10:49:57", "name": "[libcamera-devel,v3,2/3] libcamera: camera_lens: Add a new class to model a camera lens", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c16afbf7934514534881ad7e008983a14e642c6c", "submitter": { "id": 98, "url": "https://patchwork.libcamera.org/api/people/98/?format=api", "name": "Hanlin Chen", "email": "hanlinchen@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14553/mbox/", "series": [ { "id": 2712, "url": "https://patchwork.libcamera.org/api/series/2712/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2712", "date": "2021-11-11T10:49:56", "name": "[libcamera-devel,v3,1/3] ipa: ipu3: Extend ipu3 ipa interface for lens controls", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2712/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14553/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14553/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 B5C93BDB1C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 11 Nov 2021 10:50:06 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 65B0A6036F;\n\tThu, 11 Nov 2021 11:50:06 +0100 (CET)", "from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com\n\t[IPv6:2607:f8b0:4864:20::102a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 85B896032C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 11 Nov 2021 11:50:05 +0100 (CET)", "by mail-pj1-x102a.google.com with SMTP id\n\tp18-20020a17090ad31200b001a78bb52876so4110070pju.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 11 Nov 2021 02:50:05 -0800 (PST)", "from localhost ([2401:fa00:1:10:3925:da9c:3049:be7a])\n\tby smtp.gmail.com with UTF8SMTPSA id\n\ta3sm2966872pfv.5.2021.11.11.02.50.02\n\t(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);\n\tThu, 11 Nov 2021 02:50:03 -0800 (PST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"KKWiTjDN\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=ROJNiBc2iFMi52VCUP8u3Lf6VbIIQpPhjn9nRLoy+ck=;\n\tb=KKWiTjDNmJULYQbmiEkDlaRA+wU5AhRc58v2YNx9+a+s4Bc4CDaGIowfwaKES18kTF\n\tvgNJIPQhhkzMJmdSerw2hq6DCmvZ1wEbYeRbJQ3HYcR5Mb9x7DRFdKaS1fOkKKvycco7\n\thGmXGM4cfAX5NYoFdfmXKlRPTtLqI6QAoUbtc=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=ROJNiBc2iFMi52VCUP8u3Lf6VbIIQpPhjn9nRLoy+ck=;\n\tb=WOQvJTsUjtv9HokVsk2lEFKqGgG/dLHnCGCrj6IzEF4d6YPNgN7T8luyd89lyDSkcX\n\t9LqwXaD931Ou+MTiUqObZSfmR3pqiUb6U6FLM/7Banu4OTSTHPVyMnb/BavS1KrCZPqQ\n\tcAaSdodP2WLdvg9N7timcM8Hkjna/XKO3ZVM3RkroAUjkWkhfGeDGWLK4/Zl8OQSyzQl\n\tr/EjDPTQItWu+r9Qiwr6CSfZluWdYtBovleUzI5DsWd65frf6/fW/LqLsBkK0Yfv1tjj\n\tyoN7egafQiZx7e7hVd0ZdldaSXteNKp/hiNQ9dVqngC9LaILg5wX/CuqQIM48qcpxJDh\n\tJM2w==", "X-Gm-Message-State": "AOAM530B4kejajlY3yXXRa7khYuiTIieY+LvffFYruiqhfEnhlAtE/ZW\n\tpmMsIoZIevMLpoXX1DgylQv0TBBSwmTWdQ==", "X-Google-Smtp-Source": "ABdhPJw6j6JeQmhqMp584K5+Kw4HAhMZQe5b+5wOZs6ii3ssnHd/xS2heWOPlk7VbDsDk5kjj4iU3Q==", "X-Received": "by 2002:a17:902:8e87:b0:143:759c:6a2d with SMTP id\n\tbg7-20020a1709028e8700b00143759c6a2dmr6902263plb.59.1636627803764; \n\tThu, 11 Nov 2021 02:50:03 -0800 (PST)", "From": "Han-Lin Chen <hanlinchen@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 11 Nov 2021 18:49:57 +0800", "Message-Id": "<20211111104958.312070-2-hanlinchen@chromium.org>", "X-Mailer": "git-send-email 2.34.0.rc1.387.gb447b232ab-goog", "In-Reply-To": "<20211111104958.312070-1-hanlinchen@chromium.org>", "References": "<20211111104958.312070-1-hanlinchen@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 2/3] libcamera: camera_lens: Add a new\n\tclass to model a camera lens", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The CameraLens class abstracts camera lens and provides helper\nfunctions to ease interactions with them.\n\nSigned-off-by: Han-Lin Chen <hanlinchen@chromium.org>\n---\n Documentation/index.rst | 1 +\n Documentation/lens_driver_requirements.rst | 28 +++\n Documentation/meson.build | 1 +\n include/libcamera/internal/camera_lens.h | 60 +++++\n include/libcamera/internal/meson.build | 1 +\n src/libcamera/camera_lens.cpp | 253 +++++++++++++++++++++\n src/libcamera/meson.build | 1 +\n 7 files changed, 345 insertions(+)\n create mode 100644 Documentation/lens_driver_requirements.rst\n create mode 100644 include/libcamera/internal/camera_lens.h\n create mode 100644 src/libcamera/camera_lens.cpp", "diff": "diff --git a/Documentation/index.rst b/Documentation/index.rst\nindex 1f4fc485..0ee10044 100644\n--- a/Documentation/index.rst\n+++ b/Documentation/index.rst\n@@ -21,3 +21,4 @@\n Tracing guide <guides/tracing>\n Environment variables <environment_variables>\n Sensor driver requirements <sensor_driver_requirements>\n+ Lens driver requirements <lens_driver_requirements>\ndiff --git a/Documentation/lens_driver_requirements.rst b/Documentation/lens_driver_requirements.rst\nnew file mode 100644\nindex 00000000..afc300cf\n--- /dev/null\n+++ b/Documentation/lens_driver_requirements.rst\n@@ -0,0 +1,28 @@\n+.. SPDX-License-Identifier: CC-BY-SA-4.0\n+\n+.. _lens-driver-requirements:\n+\n+Lens Driver Requirements\n+========================\n+\n+libcamera handles lens devices in the CameraLens class and defines\n+a consistent interface through its API towards other library components.\n+\n+The CameraLens class uses the V4L2 subdev kernel API to interface with the\n+camera lens through one or multiple sub-devices exposed in userspace by\n+the lens driver.\n+\n+In order for libcamera to be fully operational and provide all the required\n+information to interface with the camera lens to applications and pipeline\n+handlers, a set of mandatory features the driver has to support has been defined.\n+\n+Mandatory Requirements\n+----------------------\n+\n+The lens driver is assumed to be fully compliant with the V4L2 specification.\n+\n+The lens driver shall support the following V4L2 controls:\n+\n+* `V4L2_CID_FOCUS_ABSOLUTE`_\n+\n+.. _V4L2_CID_FOCUS_ABSOLUTE: https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/ext-ctrls-camera.html\ndiff --git a/Documentation/meson.build b/Documentation/meson.build\nindex 4c972675..33af82aa 100644\n--- a/Documentation/meson.build\n+++ b/Documentation/meson.build\n@@ -66,6 +66,7 @@ if sphinx.found()\n 'guides/pipeline-handler.rst',\n 'guides/tracing.rst',\n 'index.rst',\n+ 'lens_driver_requirements.rst',\n 'sensor_driver_requirements.rst',\n '../README.rst',\n ]\ndiff --git a/include/libcamera/internal/camera_lens.h b/include/libcamera/internal/camera_lens.h\nnew file mode 100644\nindex 00000000..fba5d1fa\n--- /dev/null\n+++ b/include/libcamera/internal/camera_lens.h\n@@ -0,0 +1,60 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021, Google Inc.\n+ *\n+ * camera_lens.h - A camera lens\n+ */\n+#ifndef __LIBCAMERA_INTERNAL_CAMERA_LENS_H__\n+#define __LIBCAMERA_INTERNAL_CAMERA_LENS_H__\n+\n+#include <libcamera/base/class.h>\n+#include <libcamera/base/log.h>\n+\n+#include <libcamera/controls.h>\n+#include \"libcamera/internal/v4l2_subdevice.h\"\n+\n+namespace libcamera {\n+\n+class MediaEntity;\n+\n+class CameraLens : protected Loggable\n+{\n+public:\n+\texplicit CameraLens(const MediaEntity *entity);\n+\t~CameraLens() = default;\n+\n+\tint init();\n+\n+\tconst std::string &model() const { return model_; }\n+\tconst MediaEntity *entity() const { return entity_; }\n+\n+\tconst ControlInfoMap &controls() const;\n+\tControlList getControls(const std::vector<uint32_t> &ids);\n+\tint setControls(ControlList *ctrls);\n+\n+\tV4L2Subdevice *device() { return subdev_.get(); }\n+\n+\tconst ControlList &properties() const { return properties_; }\n+\n+protected:\n+\tstd::string logPrefix() const override;\n+\n+private:\n+\tLIBCAMERA_DISABLE_COPY(CameraLens)\n+\n+\tint generateId();\n+\tint validateLensDriver();\n+\tint initProperties();\n+\n+\tconst MediaEntity *entity_;\n+\tstd::unique_ptr<V4L2Subdevice> subdev_;\n+\n+\tstd::string model_;\n+\tstd::string id_;\n+\n+\tControlList properties_;\n+};\n+\n+} /* namespace libcamera */\n+\n+#endif /* __LIBCAMERA_INTERNAL_CAMERA_LENS_H__ */\ndiff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\nindex 665fd6de..a96bbb95 100644\n--- a/include/libcamera/internal/meson.build\n+++ b/include/libcamera/internal/meson.build\n@@ -14,6 +14,7 @@ libcamera_internal_headers = files([\n 'byte_stream_buffer.h',\n 'camera.h',\n 'camera_controls.h',\n+ 'camera_lens.h',\n 'camera_sensor.h',\n 'camera_sensor_properties.h',\n 'control_serializer.h',\ndiff --git a/src/libcamera/camera_lens.cpp b/src/libcamera/camera_lens.cpp\nnew file mode 100644\nindex 00000000..944f807e\n--- /dev/null\n+++ b/src/libcamera/camera_lens.cpp\n@@ -0,0 +1,253 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021, Google Inc.\n+ *\n+ * camera_lens.cpp - A camera lens\n+ */\n+\n+#include \"libcamera/internal/camera_lens.h\"\n+\n+#include <regex>\n+#include <libcamera/property_ids.h>\n+\n+#include \"libcamera/internal/media_device.h\"\n+#include \"libcamera/internal/sysfs.h\"\n+\n+/**\n+ * \\file camera_lens.h\n+ * \\brief A camera lens\n+ */\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(CameraLens)\n+\n+/**\n+ * \\class CameraLens\n+ * \\brief A camera lens based on V4L2 subdevices\n+ *\n+ * The CameraLens class eases handling of lens for pipeline handlers by\n+ * hiding the details of the V4L2 subdevice kernel API and caching lens\n+ * information.\n+ *\n+ * The implementation is currently limited to lens that expose a single V4L2\n+ * subdevice. It will be extended to support more complex devices as the needs\n+ * arise.\n+ */\n+\n+/**\n+ * \\brief Construct a CameraLens\n+ * \\param[in] entity The media entity backing the camera lens\n+ *\n+ * Once constructed the instance must be initialized with init().\n+ */\n+CameraLens::CameraLens(const MediaEntity *entity)\n+\t: entity_(entity),\n+\t properties_(properties::properties)\n+{\n+}\n+\n+/**\n+ * \\brief Initialize the camera lens instance\n+ *\n+ * This function performs the initialisation steps of the CameraLens that may\n+ * fail. It shall be called once and only once after constructing the instance.\n+ *\n+ * \\return 0 on success or a negative error code otherwise\n+ */\n+int CameraLens::init()\n+{\n+\tif (entity_->function() != MEDIA_ENT_F_LENS) {\n+\t\tLOG(CameraLens, Error)\n+\t\t\t<< \"Invalid lens function \"\n+\t\t\t<< utils::hex(entity_->function());\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/* Create and open the subdev. */\n+\tsubdev_ = std::make_unique<V4L2Subdevice>(entity_);\n+\tint ret = subdev_->open();\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tret = validateLensDriver();\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tret = initProperties();\n+\tif (ret)\n+\t\treturn ret;\n+\n+\treturn 0;\n+}\n+\n+int CameraLens::validateLensDriver()\n+{\n+\tint err = 0;\n+\tstatic constexpr uint32_t mandatoryControls[] = {\n+\t\tV4L2_CID_FOCUS_ABSOLUTE\n+\t};\n+\n+\tconst ControlInfoMap &controls = subdev_->controls();\n+\tfor (uint32_t ctrl : mandatoryControls) {\n+\t\tif (!controls.count(ctrl)) {\n+\t\t\tLOG(CameraLens, Error)\n+\t\t\t\t<< \"Mandatory V4L2 control \" << utils::hex(ctrl)\n+\t\t\t\t<< \" not available\";\n+\t\t\terr = -EINVAL;\n+\t\t}\n+\t}\n+\n+\tif (err) {\n+\t\tLOG(CameraLens, Error)\n+\t\t\t<< \"The lens kernel driver needs to be fixed\";\n+\t\tLOG(CameraLens, Error)\n+\t\t\t<< \"See Documentation/lens_driver_requirements.rst in\"\n+\t\t\t<< \" the libcamera sources for more information\";\n+\t\treturn err;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+int CameraLens::initProperties()\n+{\n+\t/*\n+\t * Extract the camera lens model name from the media entity name.\n+\t *\n+\t * There is no standardized naming scheme for lens entities in the\n+\t * Linux kernel at the moment.\n+\t *\n+\t * - The most common rule, used by I2C lens, associates the model\n+\t * name with the I2C bus number and address (e.g. 'dw9714 8-000c').\n+\t *\n+\t * Other schemes probably exist. As a best effort heuristic, use the\n+\t * part of the entity name before the first space if the name contains\n+\t * an I2C address, and use the full entity name otherwise.\n+\t */\n+\tstd::string entityName = entity_->name();\n+\tstd::regex i2cRegex{ \" [0-9]+-[0-9a-f]{4}\" };\n+\tstd::smatch match;\n+\n+\tif (std::regex_search(entityName, match, i2cRegex))\n+\t\tmodel_ = entityName.substr(0, entityName.find(' '));\n+\telse\n+\t\tmodel_ = entityName;\n+\n+\tproperties_.set(properties::Model, utils::toAscii(model_));\n+\n+\treturn 0;\n+}\n+\n+/**\n+ * \\fn CameraLens::model()\n+ * \\brief Retrieve the lens model name\n+ *\n+ * The lens model name is a free-formed string that uniquely identifies the\n+ * lens model.\n+ *\n+ * \\return The lens model name\n+ */\n+\n+/**\n+ * \\fn CameraLens::id()\n+ * \\brief Retrieve the lens ID\n+ *\n+ * The lens ID is a free-form string that uniquely identifies the lens in\n+ * the system.\n+ *\n+ * \\return The lens ID\n+ */\n+\n+/**\n+ * \\fn CameraLens::entity()\n+ * \\brief Retrieve the lens media entity\n+ * \\return The lens media entity\n+ */\n+\n+/**\n+ * \\brief Retrieve the supported V4L2 controls and their information\n+ *\n+ * Control information is updated automatically to reflect the current lens\n+ * configuration when the setFormat() function is called, without invalidating\n+ * any iterator on the ControlInfoMap.\n+ *\n+ * \\return A map of the V4L2 controls supported by the lens\n+ */\n+const ControlInfoMap &CameraLens::controls() const\n+{\n+\treturn subdev_->controls();\n+}\n+\n+/**\n+ * \\brief Read V4L2 controls from the lens\n+ * \\param[in] ids The list of controls to read, specified by their ID\n+ *\n+ * This function reads the value of all controls contained in \\a ids, and\n+ * returns their values as a ControlList. The control identifiers are defined by\n+ * the V4L2 specification (V4L2_CID_*).\n+ *\n+ * If any control in \\a ids is not supported by the device, is disabled (i.e.\n+ * has the V4L2_CTRL_FLAG_DISABLED flag set), or if any other error occurs\n+ * during validation of the requested controls, no control is read and this\n+ * function returns an empty control list.\n+ *\n+ * \\sa V4L2Device::getControls()\n+ *\n+ * \\return The control values in a ControlList on success, or an empty list on\n+ * error\n+ */\n+ControlList CameraLens::getControls(const std::vector<uint32_t> &ids)\n+{\n+\treturn subdev_->getControls(ids);\n+}\n+\n+/**\n+ * \\brief Write V4L2 controls to the lens\n+ * \\param[in] ctrls The list of controls to write\n+ *\n+ * This function writes the value of all controls contained in \\a ctrls, and\n+ * stores the values actually applied to the device in the corresponding \\a\n+ * ctrls entry. The control identifiers are defined by the V4L2 specification\n+ * (V4L2_CID_*).\n+ *\n+ * If any control in \\a ctrls is not supported by the device, is disabled (i.e.\n+ * has the V4L2_CTRL_FLAG_DISABLED flag set), is read-only, or if any other\n+ * error occurs during validation of the requested controls, no control is\n+ * written and this function returns -EINVAL.\n+ *\n+ * If an error occurs while writing the controls, the index of the first\n+ * control that couldn't be written is returned. All controls below that index\n+ * are written and their values are updated in \\a ctrls, while all other\n+ * controls are not written and their values are not changed.\n+ *\n+ * \\sa V4L2Device::setControls()\n+ *\n+ * \\return 0 on success or an error code otherwise\n+ * \\retval -EINVAL One of the control is not supported or not accessible\n+ * \\retval i The index of the control that failed\n+ */\n+int CameraLens::setControls(ControlList *ctrls)\n+{\n+\treturn subdev_->setControls(ctrls);\n+}\n+\n+/**\n+ * \\fn CameraLens::device()\n+ * \\brief Retrieve the camera lens device\n+ * \\todo Remove this function by integrating DelayedControl with CameraLens\n+ * \\return The camera lens device\n+ */\n+\n+/**\n+ * \\fn CameraLens::properties()\n+ * \\brief Retrieve the camera lens properties\n+ * \\return The list of camera lens properties\n+ */\n+\n+std::string CameraLens::logPrefix() const\n+{\n+\treturn \"'\" + entity_->name() + \"'\";\n+}\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 6727a777..3bee8fee 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -5,6 +5,7 @@ libcamera_sources = files([\n 'byte_stream_buffer.cpp',\n 'camera.cpp',\n 'camera_controls.cpp',\n+ 'camera_lens.cpp',\n 'camera_manager.cpp',\n 'camera_sensor.cpp',\n 'camera_sensor_properties.cpp',\n", "prefixes": [ "libcamera-devel", "v3", "2/3" ] }