Patch Detail
Show a patch.
GET /api/1.1/patches/21197/?format=api
{ "id": 21197, "url": "https://patchwork.libcamera.org/api/1.1/patches/21197/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21197/", "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": "<20240907143110.2210711-6-chenghaoyang@google.com>", "date": "2024-09-07T14:28:30", "name": "[v11,5/7] libcamera: virtual: Read config and register cameras based on the config", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "4acdacb02e942e04023cd6abdbb531c535bdc72b", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/1.1/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21197/mbox/", "series": [ { "id": 4567, "url": "https://patchwork.libcamera.org/api/1.1/series/4567/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4567", "date": "2024-09-07T14:28:25", "name": "Add VirtualPipelineHandler", "version": 11, "mbox": "https://patchwork.libcamera.org/series/4567/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21197/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21197/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 DBBD6C324C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 7 Sep 2024 14:31:35 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 79B77634FD;\n\tSat, 7 Sep 2024 16:31:35 +0200 (CEST)", "from mail-pg1-x535.google.com (mail-pg1-x535.google.com\n\t[IPv6:2607:f8b0:4864:20::535])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 99B7C634FB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 7 Sep 2024 16:31:26 +0200 (CEST)", "by mail-pg1-x535.google.com with SMTP id\n\t41be03b00d2f7-7d4ed6158bcso2279548a12.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 07 Sep 2024 07:31:26 -0700 (PDT)", "from chenghaoyang-low.c.googlers.com.com\n\t(0.223.81.34.bc.googleusercontent.com. [34.81.223.0])\n\tby smtp.gmail.com with ESMTPSA id\n\td9443c01a7336-20710e33974sm9208935ad.104.2024.09.07.07.31.22\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 07 Sep 2024 07:31:24 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"PuuTb1K5\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1725719485; x=1726324285;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=Y9GNTrvwYKCoV2mHYZeY8RTk5KzZsF7cDP+kC+DuMZk=;\n\tb=PuuTb1K5QHDiqwQNTezlUlvDpSBR2XEOjZGAyf0cNS47QwpfA+AqZsF/RHjEjs05lR\n\tFOlsaHMh/8/Ab2+xJQNIp3wHbqt7v4htQk/grLTothrXRzpjAxP4zkNtl43rEGC2V5Hg\n\t0TVjRjRREYOoPJyj7xr/RduBHIjAEKJm2Nmj0=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1725719485; x=1726324285;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=Y9GNTrvwYKCoV2mHYZeY8RTk5KzZsF7cDP+kC+DuMZk=;\n\tb=ic/sOat76xVJzUNPX9ZrJkvJ9A49SjZdBiSDxE332h9JMsdsKCy6ZLNagYb0mh4zFp\n\tmpTsfllqfAkSUSsubC1DpftON1paGQoA2Gg8c4syXRbogMxZ97Fe86wmacAu/ZJVRLOS\n\t8MQfNWH6U+FmyFZlkwKwXpLeh7Sg4Nh0vFwaUJsyPAFZbO22jNcFNbbHC6M8LeH3m4Ly\n\t5Jp2rFQyS1i7F8cMpLLJVxiUbE40PXovYt8NMqPyGUmw8ST9HMDjiIniHthrCCfUsTvW\n\ti5GgoWFmYVOuyut6UoVXbC/VtfawyFfe/KAXjUERj2Pjf7HUbgO0eDSRJgwVvy5z1ukN\n\tpL3A==", "X-Gm-Message-State": "AOJu0YxLLJ8krGtdT734r1yM/wGuis4AvSow4ZgI8d7bTEz/JlZYSUO+\n\th5wJ+7ay3p2uUpeoXuoQSlG81ulg2Y381T56Ztlxuz9K1uBXlsy2QgA2sL20HtLnXCy23+MasQg\n\tl2A==", "X-Google-Smtp-Source": "AGHT+IGibm1ZPZY5nUEgx9hQ9R+Dh2j3CAW+fJporA9IrbAt53Pq4TilMpWCxu/RBQQyEqNA8MS4UQ==", "X-Received": "by 2002:a17:902:d2d2:b0:206:b79e:5780 with SMTP id\n\td9443c01a7336-206f0507dc6mr70177065ad.24.1725719484647; \n\tSat, 07 Sep 2024 07:31:24 -0700 (PDT)", "From": "Harvey Yang <chenghaoyang@chromium.org>", "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Konami Shu <konamiz@google.com>, Harvey Yang <chenghaoyang@chromium.org>,\n\tYunke Cao <yunkec@chromium.org>, Tomasz Figa <tfiga@chromium.org>", "Subject": "[PATCH v11 5/7] libcamera: virtual: Read config and register cameras\n\tbased on the config", "Date": "Sat, 7 Sep 2024 14:28:30 +0000", "Message-ID": "<20240907143110.2210711-6-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.46.0.469.g59c65b2a67-goog", "In-Reply-To": "<20240907143110.2210711-1-chenghaoyang@google.com>", "References": "<20240907143110.2210711-1-chenghaoyang@google.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "From: Konami Shu <konamiz@google.com>\n\nThis patch introduces the configuration file for Virtual Pipeline\nHandler. The config file is written in yaml, and the format is\ndocumented in `README.md`.\n\nThe config file will define the camera with IDs, supported formats and\nimage sources, etc. Only Test Patterns are supported now, while the next\npatches will add generators to read from real images.\n\nSigned-off-by: Konami Shu <konamiz@google.com>\nCo-developed-by: Harvey Yang <chenghaoyang@chromium.org>\nCo-developed-by: Yunke Cao <yunkec@chromium.org>\nCo-developed-by: Tomasz Figa <tfiga@chromium.org>\n---\n src/libcamera/pipeline/virtual/README.md | 43 ++++\n .../pipeline/virtual/data/virtual.yaml | 36 ++++\n .../pipeline/virtual/frame_generator.h | 3 +-\n src/libcamera/pipeline/virtual/meson.build | 1 +\n src/libcamera/pipeline/virtual/parser.cpp | 197 ++++++++++++++++++\n src/libcamera/pipeline/virtual/parser.h | 42 ++++\n src/libcamera/pipeline/virtual/virtual.cpp | 56 ++---\n src/libcamera/pipeline/virtual/virtual.h | 1 +\n 8 files changed, 350 insertions(+), 29 deletions(-)\n create mode 100644 src/libcamera/pipeline/virtual/README.md\n create mode 100644 src/libcamera/pipeline/virtual/data/virtual.yaml\n create mode 100644 src/libcamera/pipeline/virtual/parser.cpp\n create mode 100644 src/libcamera/pipeline/virtual/parser.h", "diff": "diff --git a/src/libcamera/pipeline/virtual/README.md b/src/libcamera/pipeline/virtual/README.md\nnew file mode 100644\nindex 00000000..ef80bb48\n--- /dev/null\n+++ b/src/libcamera/pipeline/virtual/README.md\n@@ -0,0 +1,43 @@\n+# Virtual Pipeline Handler\n+\n+Virtual pipeline handler emulates fake external camera(s) on ChromeOS for testing.\n+\n+## Parse config file and register cameras\n+\n+- The config file is located at `src/libcamera/pipeline/virtual/data/virtual.yaml`\n+\n+### Config File Format\n+The config file contains the information about cameras' properties to register.\n+The config file should be a yaml file with dictionary of the cameraIds\n+associated with their properties as top level. The default value will be applied when any property is empty.\n+\n+Each camera block is a dictionary, containing the following keys:\n+- `supported_formats` (list of `VirtualCameraData::Resolution`, optional) : List of supported resolution and frame rates of the emulated camera\n+ - `width` (`unsigned int`, default=1920): Width of the window resolution. This needs to be even.\n+ - `height` (`unsigned int`, default=1080): Height of the window resolution.\n+ - `frame_rates` (list of `int`, default=`[30,60]` ): Range of the frame rate (per second). If the list contains one value, it's the lower bound and the upper bound. If the list contains two values, the first is the lower bound and the second is the upper bound. No other number of values is allowed.\n+- `test_pattern` (`string`): Which test pattern to use as frames. The options are \"bars\", \"lines\".\n+- `location` (`string`, default=\"front\"): The location of the camera. Support \"front\" and \"back\". This is displayed in qcam camera selection window but this does not change the output.\n+- `model` (`string`, default=\"Unknown\"): The model name of the camera. This is displayed in qcam camera selection window but this does not change the output.\n+\n+Check `data/virtual.yaml` as the sample config file.\n+\n+### Implementation\n+\n+`Parser` class provides methods to parse the config file to register cameras\n+in Virtual Pipeline Handler. `parseConfigFile()` is exposed to use in\n+Virtual Pipeline Handler.\n+\n+This is the procedure of the Parser class:\n+1. `parseConfigFile()` parses the config file to `YamlObject` using `YamlParser::parse()`.\n+ - Parse the top level of config file which are the camera ids and look into each camera properties.\n+2. For each camera, `parseCameraConfigData()` returns a camera with the configuration.\n+ - The methods in the next step fill the data with the pointer to the Camera object.\n+ - If the config file contains invalid configuration, this method returns nullptr. The camera will be skipped.\n+3. Parse each property and register the data.\n+ - `parseSupportedFormats()`: Parses `supported_formats` in the config, which contains resolutions and frame rates.\n+ - `parseTestPattern()`: Parses `test_pattern` in the config.\n+ - `parseLocation()`: Parses `location` in the config.\n+ - `parseModel()`: Parses `model` in the config.\n+4. Back to `parseConfigFile()` and append the camera configuration.\n+5. Returns a list of camera configurations.\ndiff --git a/src/libcamera/pipeline/virtual/data/virtual.yaml b/src/libcamera/pipeline/virtual/data/virtual.yaml\nnew file mode 100644\nindex 00000000..6b73ddf2\n--- /dev/null\n+++ b/src/libcamera/pipeline/virtual/data/virtual.yaml\n@@ -0,0 +1,36 @@\n+# SPDX-License-Identifier: CC0-1.0\n+%YAML 1.1\n+---\n+\"Virtual0\":\n+ supported_formats:\n+ - width: 1920\n+ height: 1080\n+ frame_rates:\n+ - 30\n+ - 60\n+ - width: 1680\n+ height: 1050\n+ frame_rates:\n+ - 70\n+ - 80\n+ test_pattern: \"lines\"\n+ location: \"front\"\n+ model: \"Virtual Video Device\"\n+\"Virtual1\":\n+ supported_formats:\n+ - width: 800\n+ height: 600\n+ frame_rates:\n+ - 60\n+ test_pattern: \"bars\"\n+ location: \"back\"\n+ model: \"Virtual Video Device1\"\n+\"Virtual2\":\n+ supported_formats:\n+ - width: 400\n+ height: 300\n+ test_pattern: \"lines\"\n+ location: \"front\"\n+ model: \"Virtual Video Device2\"\n+\"Virtual3\":\n+ test_pattern: \"bars\"\ndiff --git a/src/libcamera/pipeline/virtual/frame_generator.h b/src/libcamera/pipeline/virtual/frame_generator.h\nindex d8727b8f..f68a795f 100644\n--- a/src/libcamera/pipeline/virtual/frame_generator.h\n+++ b/src/libcamera/pipeline/virtual/frame_generator.h\n@@ -19,8 +19,7 @@ public:\n \n \tvirtual void configure(const Size &size) = 0;\n \n-\tvirtual void generateFrame(const Size &size,\n-\t\t\t\t const FrameBuffer *buffer) = 0;\n+\tvirtual void generateFrame(const Size &size, const FrameBuffer *buffer) = 0;\n \n protected:\n \tFrameGenerator() {}\ndiff --git a/src/libcamera/pipeline/virtual/meson.build b/src/libcamera/pipeline/virtual/meson.build\nindex 0c537777..d72ac5be 100644\n--- a/src/libcamera/pipeline/virtual/meson.build\n+++ b/src/libcamera/pipeline/virtual/meson.build\n@@ -1,6 +1,7 @@\n # SPDX-License-Identifier: CC0-1.0\n \n libcamera_internal_sources += files([\n+ 'parser.cpp',\n 'test_pattern_generator.cpp',\n 'virtual.cpp',\n ])\ndiff --git a/src/libcamera/pipeline/virtual/parser.cpp b/src/libcamera/pipeline/virtual/parser.cpp\nnew file mode 100644\nindex 00000000..d861a52a\n--- /dev/null\n+++ b/src/libcamera/pipeline/virtual/parser.cpp\n@@ -0,0 +1,197 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Google Inc.\n+ *\n+ * parser.cpp - Virtual cameras helper to parse config file\n+ */\n+\n+#include \"parser.h\"\n+\n+#include <memory>\n+#include <utility>\n+\n+#include <libcamera/base/log.h>\n+\n+#include <libcamera/control_ids.h>\n+#include <libcamera/property_ids.h>\n+\n+#include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/yaml_parser.h\"\n+\n+#include \"virtual.h\"\n+\n+namespace libcamera {\n+\n+LOG_DECLARE_CATEGORY(Virtual)\n+\n+std::vector<std::unique_ptr<VirtualCameraData>>\n+Parser::parseConfigFile(File &file, PipelineHandler *pipe)\n+{\n+\tstd::vector<std::unique_ptr<VirtualCameraData>> configurations;\n+\n+\tstd::unique_ptr<YamlObject> cameras = YamlParser::parse(file);\n+\tif (!cameras) {\n+\t\tLOG(Virtual, Error) << \"Failed to pass config file.\";\n+\t\treturn configurations;\n+\t}\n+\n+\tif (!cameras->isDictionary()) {\n+\t\tLOG(Virtual, Error) << \"Config file is not a dictionary at the top level.\";\n+\t\treturn configurations;\n+\t}\n+\n+\t/* Look into the configuration of each camera */\n+\tfor (const auto &[cameraId, cameraConfigData] : cameras->asDict()) {\n+\t\tstd::unique_ptr<VirtualCameraData> data =\n+\t\t\tparseCameraConfigData(cameraConfigData, pipe);\n+\t\t/* Parse configData to data*/\n+\t\tif (!data) {\n+\t\t\t/* Skip the camera if it has invalid config */\n+\t\t\tLOG(Virtual, Error) << \"Failed to parse config of the camera: \"\n+\t\t\t\t\t << cameraId;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tdata->id_ = cameraId;\n+\t\tControlInfoMap::Map controls;\n+\t\t/* todo: Check which resolution's frame rate to be reported */\n+\t\tcontrols[&controls::FrameDurationLimits] =\n+\t\t\tControlInfo(int64_t(1000000 / data->supportedResolutions_[0].frameRates[1]),\n+\t\t\t\t int64_t(1000000 / data->supportedResolutions_[0].frameRates[0]));\n+\t\tdata->controlInfo_ = ControlInfoMap(std::move(controls), controls::controls);\n+\t\tconfigurations.push_back(std::move(data));\n+\t}\n+\treturn configurations;\n+}\n+\n+std::unique_ptr<VirtualCameraData>\n+Parser::parseCameraConfigData(const YamlObject &cameraConfigData,\n+\t\t\t PipelineHandler *pipe)\n+{\n+\tstd::vector<VirtualCameraData::Resolution> resolutions;\n+\tif (parseSupportedFormats(cameraConfigData, &resolutions))\n+\t\treturn nullptr;\n+\n+\tstd::unique_ptr<VirtualCameraData> data =\n+\t\tstd::make_unique<VirtualCameraData>(pipe, resolutions);\n+\n+\tif (parseTestPattern(cameraConfigData, data.get()))\n+\t\treturn nullptr;\n+\n+\tif (parseLocation(cameraConfigData, data.get()))\n+\t\treturn nullptr;\n+\n+\tif (parseModel(cameraConfigData, data.get()))\n+\t\treturn nullptr;\n+\n+\treturn data;\n+}\n+\n+int Parser::parseSupportedFormats(const YamlObject &cameraConfigData,\n+\t\t\t\t std::vector<VirtualCameraData::Resolution> *resolutions)\n+{\n+\tif (cameraConfigData.contains(\"supported_formats\")) {\n+\t\tconst YamlObject &supportedResolutions = cameraConfigData[\"supported_formats\"];\n+\n+\t\tfor (const YamlObject &supportedResolution : supportedResolutions.asList()) {\n+\t\t\tunsigned int width = supportedResolution[\"width\"].get<unsigned int>(1920);\n+\t\t\tunsigned int height = supportedResolution[\"height\"].get<unsigned int>(1080);\n+\t\t\tif (width == 0 || height == 0) {\n+\t\t\t\tLOG(Virtual, Error) << \"Invalid width or/and height\";\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t\tif (width % 2 != 0) {\n+\t\t\t\tLOG(Virtual, Error) << \"Invalid width: width needs to be even\";\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tstd::vector<int> frameRates;\n+\t\t\tif (supportedResolution.contains(\"frame_rates\")) {\n+\t\t\t\tauto frameRatesList =\n+\t\t\t\t\tsupportedResolution[\"frame_rates\"].getList<int>();\n+\t\t\t\tif (!frameRatesList || (frameRatesList->size() != 1 &&\n+\t\t\t\t\t\t\tframeRatesList->size() != 2)) {\n+\t\t\t\t\tLOG(Virtual, Error) << \"Invalid frame_rates: either one or two values\";\n+\t\t\t\t\treturn -EINVAL;\n+\t\t\t\t}\n+\n+\t\t\t\tif (frameRatesList->size() == 2 &&\n+\t\t\t\t frameRatesList.value()[0] > frameRatesList.value()[1]) {\n+\t\t\t\t\tLOG(Virtual, Error) << \"frame_rates's first value(lower bound)\"\n+\t\t\t\t\t\t\t << \" is higher than the second value(upper bound)\";\n+\t\t\t\t\treturn -EINVAL;\n+\t\t\t\t}\n+\t\t\t\tframeRates.push_back(frameRatesList.value()[0]);\n+\t\t\t\tif (frameRatesList->size() == 2)\n+\t\t\t\t\tframeRates.push_back(frameRatesList.value()[1]);\n+\t\t\t\telse\n+\t\t\t\t\tframeRates.push_back(frameRatesList.value()[0]);\n+\t\t\t} else {\n+\t\t\t\tframeRates.push_back(30);\n+\t\t\t\tframeRates.push_back(60);\n+\t\t\t}\n+\n+\t\t\tresolutions->emplace_back(\n+\t\t\t\tVirtualCameraData::Resolution{ Size{ width, height },\n+\t\t\t\t\t\t\t frameRates });\n+\t\t}\n+\t} else {\n+\t\tresolutions->emplace_back(\n+\t\t\tVirtualCameraData::Resolution{ Size{ 1920, 1080 },\n+\t\t\t\t\t\t { 30, 60 } });\n+\t}\n+\n+\treturn 0;\n+}\n+\n+int Parser::parseTestPattern(const YamlObject &cameraConfigData, VirtualCameraData *data)\n+{\n+\tstd::string testPattern = cameraConfigData[\"test_pattern\"].get<std::string>(\"\");\n+\n+\t/* Default value is \"bars\" */\n+\tif (testPattern == \"bars\") {\n+\t\tdata->testPattern_ = TestPattern::ColorBars;\n+\t} else if (testPattern == \"lines\") {\n+\t\tdata->testPattern_ = TestPattern::DiagonalLines;\n+\t} else {\n+\t\tLOG(Virtual, Error) << \"Test pattern: \" << testPattern\n+\t\t\t\t << \"is not supported\";\n+\t\treturn -EINVAL;\n+\t}\n+\treturn 0;\n+}\n+\n+int Parser::parseLocation(const YamlObject &cameraConfigData, VirtualCameraData *data)\n+{\n+\tstd::string location = cameraConfigData[\"location\"].get<std::string>(\"\");\n+\n+\t/* Default value is properties::CameraLocationFront */\n+\tif (location == \"front\" || location == \"\") {\n+\t\tdata->properties_.set(properties::Location,\n+\t\t\t\t properties::CameraLocationFront);\n+\t} else if (location == \"back\") {\n+\t\tdata->properties_.set(properties::Location,\n+\t\t\t\t properties::CameraLocationBack);\n+\t} else {\n+\t\tLOG(Virtual, Error) << \"location: \" << location\n+\t\t\t\t << \" is not supported\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+int Parser::parseModel(const YamlObject &cameraConfigData, VirtualCameraData *data)\n+{\n+\tstd::string model = cameraConfigData[\"model\"].get<std::string>(\"\");\n+\n+\t/* Default value is \"Unknown\" */\n+\tif (model == \"\")\n+\t\tdata->properties_.set(properties::Model, \"Unknown\");\n+\telse\n+\t\tdata->properties_.set(properties::Model, model);\n+\n+\treturn 0;\n+}\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/virtual/parser.h b/src/libcamera/pipeline/virtual/parser.h\nnew file mode 100644\nindex 00000000..09c3c56b\n--- /dev/null\n+++ b/src/libcamera/pipeline/virtual/parser.h\n@@ -0,0 +1,42 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Google Inc.\n+ *\n+ * parser.h - Virtual cameras helper to parse config file\n+ */\n+\n+#pragma once\n+\n+#include <memory>\n+#include <vector>\n+\n+#include <libcamera/base/file.h>\n+\n+#include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/yaml_parser.h\"\n+\n+#include \"virtual.h\"\n+\n+namespace libcamera {\n+\n+class Parser\n+{\n+public:\n+\tParser() {}\n+\t~Parser() = default;\n+\n+\tstd::vector<std::unique_ptr<VirtualCameraData>>\n+\tparseConfigFile(File &file, PipelineHandler *pipe);\n+\n+private:\n+\tstd::unique_ptr<VirtualCameraData>\n+\tparseCameraConfigData(const YamlObject &cameraConfigData, PipelineHandler *pipe);\n+\n+\tint parseSupportedFormats(const YamlObject &cameraConfigData,\n+\t\t\t\t std::vector<VirtualCameraData::Resolution> *resolutions);\n+\tint parseTestPattern(const YamlObject &cameraConfigData, VirtualCameraData *data);\n+\tint parseLocation(const YamlObject &cameraConfigData, VirtualCameraData *data);\n+\tint parseModel(const YamlObject &cameraConfigData, VirtualCameraData *data);\n+};\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/virtual/virtual.cpp b/src/libcamera/pipeline/virtual/virtual.cpp\nindex 6e64aeee..55bc30df 100644\n--- a/src/libcamera/pipeline/virtual/virtual.cpp\n+++ b/src/libcamera/pipeline/virtual/virtual.cpp\n@@ -24,6 +24,9 @@\n #include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/yaml_parser.h\"\n+\n+#include \"parser.h\"\n \n namespace libcamera {\n \n@@ -55,6 +58,9 @@ VirtualCameraData::VirtualCameraData(PipelineHandler *pipe,\n \t\tmaxResolutionSize_ = std::max(maxResolutionSize_, resolution.size);\n \t}\n \n+\tproperties_.set(properties::PixelArrayActiveAreas,\n+\t\t\t{ Rectangle(maxResolutionSize_) });\n+\n \t/* \\todo Support multiple streams and pass multi_stream_test */\n \tstreamConfigs_.resize(kMaxStream);\n }\n@@ -248,37 +254,33 @@ bool PipelineHandlerVirtual::match([[maybe_unused]] DeviceEnumerator *enumerator\n \n \tcreated_ = true;\n \n-\t/* \\todo Add virtual cameras according to a config file. */\n-\n-\tstd::vector<VirtualCameraData::Resolution> supportedResolutions;\n-\tsupportedResolutions.resize(2);\n-\tsupportedResolutions[0] = { .size = Size(1920, 1080), .frameRates = { 30 } };\n-\tsupportedResolutions[1] = { .size = Size(1280, 720), .frameRates = { 30 } };\n-\n-\tstd::unique_ptr<VirtualCameraData> data =\n-\t\tstd::make_unique<VirtualCameraData>(this, supportedResolutions);\n-\n-\tdata->properties_.set(properties::Location, properties::CameraLocationFront);\n-\tdata->properties_.set(properties::Model, \"Virtual Video Device\");\n-\tdata->properties_.set(properties::PixelArrayActiveAreas, { Rectangle(Size(1920, 1080)) });\n-\n-\t/* \\todo Set FrameDurationLimits based on config. */\n-\tControlInfoMap::Map controls;\n-\tint64_t min_frame_duration = 33333, max_frame_duration = 33333;\n-\tcontrols[&controls::FrameDurationLimits] = ControlInfo(min_frame_duration, max_frame_duration);\n-\tdata->controlInfo_ = ControlInfoMap(std::move(controls), controls::controls);\n+\tFile file(configurationFile(\"virtual\", \"virtual.yaml\"));\n+\tbool isOpen = file.open(File::OpenModeFlag::ReadOnly);\n+\tif (!isOpen) {\n+\t\tLOG(Virtual, Error) << \"Failed to open config file: \" << file.fileName();\n+\t\treturn false;\n+\t}\n \n-\t/* Create and register the camera. */\n-\tstd::set<Stream *> streams;\n-\tfor (auto &streamConfig : data->streamConfigs_)\n-\t\tstreams.insert(&streamConfig.stream);\n+\tParser parser;\n+\tauto configData = parser.parseConfigFile(file, this);\n+\tif (configData.size() == 0) {\n+\t\tLOG(Virtual, Error) << \"Failed to parse any cameras from the config file: \"\n+\t\t\t\t << file.fileName();\n+\t\treturn false;\n+\t}\n \n-\tconst std::string id = \"Virtual0\";\n-\tstd::shared_ptr<Camera> camera = Camera::create(std::move(data), id, streams);\n+\t/* Configure and register cameras with configData */\n+\tfor (auto &data : configData) {\n+\t\tstd::set<Stream *> streams;\n+\t\tfor (auto &streamConfig : data->streamConfigs_)\n+\t\t\tstreams.insert(&streamConfig.stream);\n+\t\tstd::string id = data->id_;\n+\t\tstd::shared_ptr<Camera> camera = Camera::create(std::move(data), id, streams);\n \n-\tinitFrameGenerator(camera.get());\n+\t\tinitFrameGenerator(camera.get());\n \n-\tregisterCamera(std::move(camera));\n+\t\tregisterCamera(std::move(camera));\n+\t}\n \n \treturn true;\n }\ndiff --git a/src/libcamera/pipeline/virtual/virtual.h b/src/libcamera/pipeline/virtual/virtual.h\nindex 09d73051..8830e00f 100644\n--- a/src/libcamera/pipeline/virtual/virtual.h\n+++ b/src/libcamera/pipeline/virtual/virtual.h\n@@ -39,6 +39,7 @@ public:\n \n \t~VirtualCameraData() = default;\n \n+\tstd::string id_;\n \tTestPattern testPattern_ = TestPattern::ColorBars;\n \n \tconst std::vector<Resolution> supportedResolutions_;\n", "prefixes": [ "v11", "5/7" ] }