Patch Detail
Show a patch.
GET /api/1.1/patches/14806/?format=api
{ "id": 14806, "url": "https://patchwork.libcamera.org/api/1.1/patches/14806/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14806/", "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": "<20211126112903.3276056-3-hanlinchen@chromium.org>", "date": "2021-11-26T11:29:01", "name": "[libcamera-devel,v5,2/4] libcamera: add model() for retriving model name in V4L2Subdevice", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "ecdb5a99bf6f99a77d60d5c4ed4a64cd55a0a651", "submitter": { "id": 98, "url": "https://patchwork.libcamera.org/api/1.1/people/98/?format=api", "name": "Hanlin Chen", "email": "hanlinchen@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14806/mbox/", "series": [ { "id": 2762, "url": "https://patchwork.libcamera.org/api/1.1/series/2762/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2762", "date": "2021-11-26T11:28:59", "name": "Introduce Lens class and apply auto focus on ipu3", "version": 5, "mbox": "https://patchwork.libcamera.org/series/2762/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14806/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14806/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 62EBEBF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 26 Nov 2021 11:29:22 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 197E660555;\n\tFri, 26 Nov 2021 12:29:22 +0100 (CET)", "from mail-pl1-x629.google.com (mail-pl1-x629.google.com\n\t[IPv6:2607:f8b0:4864:20::629])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 698096011E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 26 Nov 2021 12:29:18 +0100 (CET)", "by mail-pl1-x629.google.com with SMTP id b11so6485532pld.12\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 26 Nov 2021 03:29:18 -0800 (PST)", "from localhost ([2401:fa00:1:10:a0de:e637:c058:6824])\n\tby smtp.gmail.com with UTF8SMTPSA id\n\tc18sm7133362pfl.201.2021.11.26.03.29.15\n\t(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);\n\tFri, 26 Nov 2021 03:29:16 -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=\"I4Uphpqa\"; 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=Eo24BCzFTNfwI9ZVqRhR4vaLcTMu7CGBWJcis3efd/E=;\n\tb=I4UphpqaDnCcuQVHDP4g+e8I7aygtyL/mXrKz1MH73zEXaDcI8fGB5wKaprNgrwVAd\n\tONreeBAeIyu0eXpWyDgC7AGcbtCIe85mgvIbNjg5IAIloSteq3U8dVkFJjOLru/9N6cA\n\t6zaPRaPZqfyeaO/K2JvR3ImFdX7NpKOC8dYFI=", "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=Eo24BCzFTNfwI9ZVqRhR4vaLcTMu7CGBWJcis3efd/E=;\n\tb=aVlDli0QrQFytO5Mtabo75Ax7ArvroHFfTvCA8LgOw6YGHEYZjdMCPAAcvu1TXlQLL\n\t/AFX+EFcqx01kK61mIQyJWeYsMEBMugUcSPdKhmYHUnW1YHLSNrD/pOFDzKEZ2NBVQGX\n\t4R8LJtF9FawhwmvDVIVY0SigM+ShcI1ZPJz/lfGpUilrU3p/39ZuNPuRYBXLWGso7Lgy\n\twsr9wxBdxpxlpo1loE1Is2ZIp8YkIal+lJa5ADSlZm9PF5nJav+auUuJMcu/kDFwLrxJ\n\t9UHfOcZgbr3HJNiWmrwN3mujIcejqUbQuz0fg7yZa0tBpYKjO6fvCnnkzTOk/3PR2abh\n\tj6/Q==", "X-Gm-Message-State": "AOAM532+X/tevS5P78RfCQZex0cYgBya/YWuSYZ2aY7rBhiUC3+VQ9cx\n\t6oLKooCpCFmKv+Hz78Wh7joG4w0frlMH0A==", "X-Google-Smtp-Source": "ABdhPJzhsbqKpYs7LEtMJhp9pNDT15yjK/wmGHCI5GwnUYaDrF1iE4xWkGj6Oj4S4LGl31O6ZfG9xw==", "X-Received": "by 2002:a17:90a:909:: with SMTP id\n\tn9mr15067185pjn.1.1637926156454; \n\tFri, 26 Nov 2021 03:29:16 -0800 (PST)", "From": "Han-Lin Chen <hanlinchen@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 26 Nov 2021 19:29:01 +0800", "Message-Id": "<20211126112903.3276056-3-hanlinchen@chromium.org>", "X-Mailer": "git-send-email 2.34.0.rc2.393.gf8c9666880-goog", "In-Reply-To": "<20211126112903.3276056-1-hanlinchen@chromium.org>", "References": "<20211126112903.3276056-1-hanlinchen@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v5 2/4] libcamera: add model() for\n\tretriving model name in V4L2Subdevice", "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": "CameraSensor retrives model name from media entity. Move the heuristics\nmethod into V4L2Subdevice, so CameraLens can reuse the function.\n\nSigned-off-by: Han-Lin Chen <hanlinchen@chromium.org>\n---\n include/libcamera/internal/v4l2_subdevice.h | 5 +++\n src/libcamera/camera_sensor.cpp | 13 ++-----\n src/libcamera/v4l2_subdevice.cpp | 40 +++++++++++++++++++++\n 3 files changed, 47 insertions(+), 11 deletions(-)", "diff": "diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\nindex 97b89fb9..794c80c6 100644\n--- a/include/libcamera/internal/v4l2_subdevice.h\n+++ b/include/libcamera/internal/v4l2_subdevice.h\n@@ -61,6 +61,8 @@ public:\n \tint setFormat(unsigned int pad, V4L2SubdeviceFormat *format,\n \t\t Whence whence = ActiveFormat);\n \n+\tstd::string model() { return model_; }\n+\n \tstatic std::unique_ptr<V4L2Subdevice>\n \tfromEntityName(const MediaDevice *media, const std::string &entity);\n \n@@ -73,8 +75,11 @@ private:\n \tstd::vector<unsigned int> enumPadCodes(unsigned int pad);\n \tstd::vector<SizeRange> enumPadSizes(unsigned int pad,\n \t\t\t\t\t unsigned int code);\n+\tvoid generateModel();\n \n \tconst MediaEntity *entity_;\n+\n+\tstd::string model_;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 9fdb8c09..3659ff2d 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -13,7 +13,6 @@\n #include <iomanip>\n #include <limits.h>\n #include <math.h>\n-#include <regex>\n #include <string.h>\n \n #include <libcamera/property_ids.h>\n@@ -366,15 +365,7 @@ int CameraSensor::initProperties()\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+\tmodel_ = subdev_->model();\n \tproperties_.set(properties::Model, utils::toAscii(model_));\n \n \t/* Generate a unique ID for the sensor. */\n@@ -832,7 +823,7 @@ int CameraSensor::generateId()\n \t/*\n \t * Virtual sensors not described in firmware\n \t *\n-\t * Verify it's a platform device and construct ID from the deive path\n+\t * Verify it's a platform device and construct ID from the device path\n \t * and model of sensor.\n \t */\n \tif (devPath.find(\"/sys/devices/platform/\", 0) == 0) {\ndiff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\nindex 023e2328..0e194081 100644\n--- a/src/libcamera/v4l2_subdevice.cpp\n+++ b/src/libcamera/v4l2_subdevice.cpp\n@@ -9,6 +9,7 @@\n \n #include <fcntl.h>\n #include <iomanip>\n+#include <regex>\n #include <sstream>\n #include <string.h>\n #include <sys/ioctl.h>\n@@ -239,6 +240,7 @@ uint8_t V4L2SubdeviceFormat::bitsPerPixel() const\n V4L2Subdevice::V4L2Subdevice(const MediaEntity *entity)\n \t: V4L2Device(entity->deviceNode()), entity_(entity)\n {\n+\tgenerateModel();\n }\n \n V4L2Subdevice::~V4L2Subdevice()\n@@ -442,6 +444,12 @@ int V4L2Subdevice::setFormat(unsigned int pad, V4L2SubdeviceFormat *format,\n \treturn 0;\n }\n \n+/**\n+ * \\fn V4L2Subdevice::model()\n+ * \\brief Retrieve the model name\n+ * \\return The model name of the device\n+ */\n+\n /**\n * \\brief Create a new video subdevice instance from \\a entity in media device\n * \\a media\n@@ -525,4 +533,36 @@ std::vector<SizeRange> V4L2Subdevice::enumPadSizes(unsigned int pad,\n \treturn sizes;\n }\n \n+void V4L2Subdevice::generateModel()\n+{\n+\t/*\n+\t * Extract model name from the media entity name.\n+\t *\n+\t * There is no standardized naming scheme for sensor entities in the\n+\t * Linux kernel at the moment.\n+\t *\n+\t * - The most common rule, used by I2C sensors, associates the model\n+\t * name with the I2C bus number and address (e.g. 'imx219 0-0010').\n+\t *\n+\t * - When the sensor exposes multiple subdevs, the model name is\n+\t * usually followed by a function name, as in the smiapp driver (e.g.\n+\t * 'jt8ew9 pixel_array 0-0010').\n+\t *\n+\t * - The vimc driver names its sensors 'Sensor A' and 'Sensor B'.\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+\tstd::string model;\n+\tif (std::regex_search(entityName, match, i2cRegex))\n+\t\tmodel_ = entityName.substr(0, entityName.find(' '));\n+\telse\n+\t\tmodel_ = entityName;\n+}\n+\n } /* namespace libcamera */\n", "prefixes": [ "libcamera-devel", "v5", "2/4" ] }