Patch Detail
Show a patch.
GET /api/patches/26612/?format=api
{ "id": 26612, "url": "https://patchwork.libcamera.org/api/patches/26612/?format=api", "web_url": "https://patchwork.libcamera.org/patch/26612/", "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": "<20260504091623.3354474-3-maxbretschneider@protonmail.com>", "date": "2026-05-04T09:17:03", "name": "[2/2] libcamera: pipeline: virtual: Add raw_frames config and Bayer format support", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "37007b4e7d258e3e2ceb38feb45ee72baa62dafd", "submitter": { "id": 266, "url": "https://patchwork.libcamera.org/api/people/266/?format=api", "name": "Max Bretschneider", "email": "maxbretschneider@protonmail.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/26612/mbox/", "series": [ { "id": 5901, "url": "https://patchwork.libcamera.org/api/series/5901/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5901", "date": "2026-05-04T09:16:41", "name": "libcamera: pipeline: virtual: Add raw Bayer frame support", "version": 2, "mbox": "https://patchwork.libcamera.org/series/5901/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/26612/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/26612/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 E5D37BDCB5\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 4 May 2026 09:17:09 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 81B6663029;\n\tMon, 4 May 2026 11:17:09 +0200 (CEST)", "from mail-24428.protonmail.ch (mail-24428.protonmail.ch\n\t[109.224.244.28])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0D74D63022\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 4 May 2026 11:17:08 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=protonmail.com header.i=@protonmail.com\n\theader.b=\"m3n7YMpe\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com;\n\ts=protonmail3; t=1777886227; x=1778145427;\n\tbh=5iKfOQb8SFqhcw16zuUTFtndQ7JYG8ZRG9XssaI3QG0=;\n\th=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References:\n\tFeedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID:\n\tMessage-ID:BIMI-Selector;\n\tb=m3n7YMpei7hyX00by5S32LIcPgWeDlhu66YftMmouQn9ODHEDW8j+sHMkXLf9u4Og\n\tx9roJidJG6x6FGVEgj23VCqbZ8iM5P1bizCVg7YRXZSk8sZywjxADE0VM823Z3ErRQ\n\t/vS2q5zF55EcxBXOeWf1enEu97vFJ+sxyPLRtc1y7tpH1P0/yUYfgrR+SHzRoBd85Q\n\tfBoJi04ZVyRpAzQzOoWu0ddT2Ra7NdpFS7J/NSdmxI7v62oPvxKSue9OXGPSB1QGad\n\tQ5BRA4dD5AwaqZneGZeeF99W1w5jx5Gqt9vKYO9XU+t0UtirP/5SfWLdQiUg4qPE1o\n\ty6qsFP8SPyq1g==", "Date": "Mon, 04 May 2026 09:17:03 +0000", "To": "libcamera-devel@lists.libcamera.org", "From": "maxbretschneider@protonmail.com", "Cc": "Max Bretschneider <maxbretschneider@protonmail.com>", "Subject": "[PATCH 2/2] libcamera: pipeline: virtual: Add raw_frames config and\n\tBayer format support", "Message-ID": "<20260504091623.3354474-3-maxbretschneider@protonmail.com>", "In-Reply-To": "<20260504091623.3354474-1-maxbretschneider@protonmail.com>", "References": "<20260501105137.439519-1-maxbretschneider@protonmail.com>\n\t<20260504091623.3354474-1-maxbretschneider@protonmail.com>", "Feedback-ID": "122687743:user:proton", "X-Pm-Message-ID": "afcca11e86c8eda66757d26c4370419c28b2d852", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=utf-8", "Content-Transfer-Encoding": "quoted-printable", "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: Max Bretschneider <maxbretschneider@protonmail.com>\n\nExtend parseFrameGenerator() to handle the new raw_frames YAML key\nalongside the existing test_pattern and frames keys. File collection\nlogic (e.g. either single file or directory with natural sorting)\nfollows the existing frames path handling. This raw_frames block\naccepts:\n- path (single file or directory)\n- bayer_order (RGGB, BGGR, GRBG, GBRG)\n- bit_depth (8, 10, 12, 14, 16), in accordance to libcamera/formats.yaml\n\nExtend generateConfiguration() to return a Bayer StreamConfiguration\nwhen the StreamRole::Raw is requested on a camera configured with\nraw_frames. Extend validate() to allow Bayer formats, also set the correct stride\nand frameSize for single plane Bayer buffers. Sensor properties required\nfor SoftISP integration are also declared in match().\n\nSigned-off-by: Max Bretschneider <maxbretschneider@protonmail.com>\n---\n .../pipeline/virtual/config_parser.cpp | 100 +++++++++++++-\n src/libcamera/pipeline/virtual/virtual.cpp | 123 +++++++++++++++---\n src/libcamera/pipeline/virtual/virtual.h | 3 +-\n 3 files changed, 203 insertions(+), 23 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/virtual/config_parser.cpp b/src/libcamera/pipeline/virtual/config_parser.cpp\nindex 5169fd39..fcce70c8 100644\n--- a/src/libcamera/pipeline/virtual/config_parser.cpp\n+++ b/src/libcamera/pipeline/virtual/config_parser.cpp\n@@ -156,13 +156,20 @@ int ConfigParser::parseFrameGenerator(const ValueNode &cameraConfigData, Virtual\n {\n \tconst std::string testPatternKey = \"test_pattern\";\n \tconst std::string framesKey = \"frames\";\n-\tif (cameraConfigData.contains(testPatternKey)) {\n-\t\tif (cameraConfigData.contains(framesKey)) {\n-\t\t\tLOG(Virtual, Error) << \"A camera should use either \"\n-\t\t\t\t\t << testPatternKey << \" or \" << framesKey;\n-\t\t\treturn -EINVAL;\n-\t\t}\n+\tconst std::string rawFramesKey = \"raw_frames\";\n+\n+\t/* Ensure only one frame source is specified */\n+\tint sourcesSpecified = cameraConfigData.contains(testPatternKey) +\n+\t\t\t cameraConfigData.contains(framesKey) +\n+\t\t\t cameraConfigData.contains(rawFramesKey);\n+\tif (sourcesSpecified > 1) {\n+\t\tLOG(Virtual, Error) << \"A camera should use only one of \"\n+\t\t\t\t << testPatternKey << \", \" << framesKey\n+\t\t\t\t << \", or \" << rawFramesKey;\n+\t\treturn -EINVAL;\n+\t}\n \n+\tif (cameraConfigData.contains(testPatternKey)) {\n \t\tauto testPattern = cameraConfigData[testPatternKey].get<std::string>(\"\");\n \n \t\tif (testPattern == \"bars\") {\n@@ -178,6 +185,87 @@ int ConfigParser::parseFrameGenerator(const ValueNode &cameraConfigData, Virtual\n \t\treturn 0;\n \t}\n \n+\tif (cameraConfigData.contains(rawFramesKey)) {\n+\t\tconst ValueNode &rawFrames = cameraConfigData[rawFramesKey];\n+\n+\t\tif (!rawFrames.isDictionary()) {\n+\t\t\tLOG(Virtual, Error) << \"'raw_frames' is not a dictionary.\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tauto path = rawFrames[\"path\"].get<std::string>();\n+\t\tif (!path) {\n+\t\t\tLOG(Virtual, Error) << \"raw_frames: path must be specified.\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tstd::vector<std::filesystem::path> files;\n+\n+\t\tswitch (std::filesystem::symlink_status(*path).type()) {\n+\t\tcase std::filesystem::file_type::regular:\n+\t\t\tfiles.push_back(*path);\n+\t\t\tbreak;\n+\n+\t\tcase std::filesystem::file_type::directory:\n+\t\t\tfor (const auto &dentry : std::filesystem::directory_iterator{ *path })\n+\t\t\t\tif (dentry.is_regular_file())\n+\t\t\t\t\tfiles.push_back(dentry.path());\n+\n+\t\t\tstd::sort(files.begin(), files.end(), [](const auto &a, const auto &b) {\n+\t\t\t\treturn ::strverscmp(a.c_str(), b.c_str()) < 0;\n+\t\t\t});\n+\n+\t\t\tif (files.empty()) {\n+\t\t\t\tLOG(Virtual, Error) << \"raw_frames directory has no files: \" << *path;\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tLOG(Virtual, Error) << \"raw_frames path: \" << *path << \" is not supported\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\t/* Parse bayer_order */\n+\t\tauto bayerOrder = rawFrames[\"bayer_order\"].get<std::string>();\n+\t\tif (!bayerOrder) {\n+\t\t\tLOG(Virtual, Error) << \"raw_frames: bayer_order must be specified.\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tstatic const std::map<std::string, uint32_t> bayerOrderMap = {\n+\t\t\t{ \"RGGB\", properties::draft::ColorFilterArrangementEnum::RGGB },\n+\t\t\t{ \"BGGR\", properties::draft::ColorFilterArrangementEnum::BGGR },\n+\t\t\t{ \"GRBG\", properties::draft::ColorFilterArrangementEnum::GRBG },\n+\t\t\t{ \"GBRG\", properties::draft::ColorFilterArrangementEnum::GBRG },\n+\t\t};\n+\n+\t\tauto it = bayerOrderMap.find(*bayerOrder);\n+\t\tif (it == bayerOrderMap.end()) {\n+\t\t\tLOG(Virtual, Error) << \"raw_frames: unsupported bayer_order: \"\n+\t\t\t\t\t << *bayerOrder\n+\t\t\t\t\t << \", must be one of RGGB, BGGR, GRBG, GBRG\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\t/* Parse bit_depth */\n+\t\tauto bitDepth = rawFrames[\"bit_depth\"].get<unsigned int>();\n+\t\tif (!bitDepth) {\n+\t\t\tLOG(Virtual, Error) << \"raw_frames: bit_depth must be specified.\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tstatic const std::set<unsigned int> supportedBitDepths = { 8, 10, 12, 14, 16 };\n+\t\tif (supportedBitDepths.find(*bitDepth) == supportedBitDepths.end()) {\n+\t\t\tLOG(Virtual, Error) << \"raw_frames: bit_depth unsupported: \" << *bitDepth\n+\t\t\t\t\t << \", must be one of 8, 10, 12, 14, 16\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tdata->config_.frame = RawFrames{ std::move(files), it->second, *bitDepth };\n+\n+\t\treturn 0;\n+\t}\n+\n \tconst ValueNode &frames = cameraConfigData[framesKey];\n \n \t/* When there is no frames provided in the config file, use color bar test pattern */\ndiff --git a/src/libcamera/pipeline/virtual/virtual.cpp b/src/libcamera/pipeline/virtual/virtual.cpp\nindex 81d2ddda..beec2f5a 100644\n--- a/src/libcamera/pipeline/virtual/virtual.cpp\n+++ b/src/libcamera/pipeline/virtual/virtual.cpp\n@@ -19,6 +19,7 @@\n #include <string>\n #include <time.h>\n #include <utility>\n+#include <variant>\n #include <vector>\n \n #include <libcamera/base/flags.h>\n@@ -37,7 +38,6 @@\n #include \"libcamera/internal/framebuffer.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n #include \"libcamera/internal/request.h\"\n-#include \"libcamera/internal/value_node.h\"\n \n #include \"pipeline/virtual/config_parser.h\"\n \n@@ -202,21 +202,28 @@ CameraConfiguration::Status VirtualCameraConfiguration::validate()\n \t\t\tadjusted = true;\n \t\t}\n \n-\t\tif (cfg.pixelFormat != formats::NV12) {\n-\t\t\tcfg.pixelFormat = formats::NV12;\n-\t\t\tstatus = Adjusted;\n-\t\t\tadjusted = true;\n-\t\t}\n+\t\tconst PixelFormatInfo &fmtInfo = PixelFormatInfo::info(cfg.pixelFormat);\n+\t\tconst bool rawStream = fmtInfo.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n \n-\t\tif (cfg.colorSpace != ColorSpace::Rec709) {\n-\t\t\tcfg.colorSpace = ColorSpace::Rec709;\n-\t\t\tstatus = Adjusted;\n-\t\t\tadjusted = true;\n-\t\t}\n+\t\tif (!rawStream) {\n+\t\t\tif (cfg.pixelFormat != formats::NV12) {\n+\t\t\t\tcfg.pixelFormat = formats::NV12;\n+\t\t\t\tstatus = Adjusted;\n+\t\t\t\tadjusted = true;\n+\t\t\t}\n \n-\t\tif (validateColorSpaces() == Adjusted) {\n-\t\t\tstatus = Adjusted;\n-\t\t\tadjusted = true;\n+\t\t\tif (cfg.colorSpace != ColorSpace::Rec709) {\n+\t\t\t\tcfg.colorSpace = ColorSpace::Rec709;\n+\t\t\t\tstatus = Adjusted;\n+\t\t\t\tadjusted = true;\n+\t\t\t}\n+\n+\t\t\tif (validateColorSpaces() == Adjusted) {\n+\t\t\t\tstatus = Adjusted;\n+\t\t\t\tadjusted = true;\n+\t\t\t}\n+\t\t} else {\n+\t\t\tcfg.colorSpace = ColorSpace::Raw;\n \t\t}\n \n \t\tif (adjusted)\n@@ -267,7 +274,64 @@ PipelineHandlerVirtual::generateConfiguration(Camera *camera,\n \t\tcase StreamRole::Viewfinder:\n \t\t\tbreak;\n \n-\t\tcase StreamRole::Raw:\n+\t\tcase StreamRole::Raw: {\n+\t\t\tif (!std::holds_alternative<RawFrames>(data->config_.frame)) {\n+\t\t\t\tLOG(Virtual, Error)\n+\t\t\t\t\t<< \"StreamRole::Raw requested but camera is not configured with raw_frames\";\n+\t\t\t\treturn {};\n+\t\t\t}\n+\n+\t\t\tconst auto &rawFrames = std::get<RawFrames>(data->config_.frame);\n+\t\t\tPixelFormat rawFormat;\n+\n+\t\t\t/*\n+\t\t\t * \\todo Possibly replace with a 2D lookup table to\n+\t\t\t * be able to just index by (cfaPatter, bitDepth),\n+\t\t\t * might be cleaner.\n+\t\t\t */\n+\t\t\tauto bayerFormat = [&](PixelFormat f8, PixelFormat f10,\n+\t\t\t\t\t PixelFormat f12, PixelFormat f14,\n+\t\t\t\t\t PixelFormat f16) {\n+\t\t\t\tswitch (rawFrames.bitDepth) {\n+\t\t\t\tcase 8:\n+\t\t\t\t\treturn f8;\n+\t\t\t\tcase 10:\n+\t\t\t\t\treturn f10;\n+\t\t\t\tcase 12:\n+\t\t\t\t\treturn f12;\n+\t\t\t\tcase 14:\n+\t\t\t\t\treturn f14;\n+\t\t\t\tdefault:\n+\t\t\t\t\treturn f16;\n+\t\t\t\t}\n+\t\t\t};\n+\n+\t\t\t/* Map bayer order and bit depth to pixel format */\n+\t\t\tif (rawFrames.cfaPattern == properties::draft::ColorFilterArrangementEnum::RGGB)\n+\t\t\t\trawFormat = bayerFormat(formats::SRGGB8, formats::SRGGB10, formats::SRGGB12, formats::SRGGB14, formats::SRGGB16);\n+\t\t\telse if (rawFrames.cfaPattern == properties::draft::ColorFilterArrangementEnum::BGGR)\n+\t\t\t\trawFormat = bayerFormat(formats::SBGGR8, formats::SBGGR10, formats::SBGGR12, formats::SBGGR14, formats::SBGGR16);\n+\t\t\telse if (rawFrames.cfaPattern == properties::draft::ColorFilterArrangementEnum::GRBG)\n+\t\t\t\trawFormat = bayerFormat(formats::SGRBG8, formats::SGRBG10, formats::SGRBG12, formats::SGRBG14, formats::SGRBG16);\n+\t\t\telse\n+\t\t\t\trawFormat = bayerFormat(formats::SGBRG8, formats::SGBRG10, formats::SGBRG12, formats::SGBRG14, formats::SGBRG16);\n+\n+\t\t\t/*\n+\t\t\t * Use the Bayer format matching the raw frame\n+\t\t\t * configuration.\n+\t\t\t */\n+\t\t\tstd::map<PixelFormat, std::vector<SizeRange>> rawStreamFormats;\n+\t\t\trawStreamFormats[rawFormat] = { { data->config_.minResolutionSize, data->config_.maxResolutionSize } };\n+\t\t\tStreamFormats rawFormats(rawStreamFormats);\n+\t\t\tStreamConfiguration rawCfg(rawFormats);\n+\t\t\trawCfg.pixelFormat = rawFormat;\n+\t\t\trawCfg.size = data->config_.maxResolutionSize;\n+\t\t\trawCfg.bufferCount = VirtualCameraConfiguration::kBufferCount;\n+\t\t\trawCfg.colorSpace = ColorSpace::Raw;\n+\t\t\tconfig->addConfiguration(rawCfg);\n+\t\t\tcontinue;\n+\t\t}\n+\n \t\tdefault:\n \t\t\tLOG(Virtual, Error)\n \t\t\t\t<< \"Requested stream role not supported: \" << role;\n@@ -401,6 +465,28 @@ bool PipelineHandlerVirtual::match([[maybe_unused]] DeviceEnumerator *enumerator\n \t\tstd::set<Stream *> streams;\n \t\tfor (auto &streamConfig : data->streamConfigs_)\n \t\t\tstreams.insert(&streamConfig.stream);\n+\n+\t\t/* Add sensor properties and controls required by SoftISP for raw streams */\n+\t\tif (std::holds_alternative<RawFrames>(data->config_.frame)) {\n+\t\t\tconst auto &rawFrames = std::get<RawFrames>(data->config_.frame);\n+\t\t\tdata->properties_.set(properties::draft::ColorFilterArrangement, static_cast<int32_t>(rawFrames.cfaPattern));\n+\t\t\tdata->properties_.set(properties::PixelArraySize, data->config_.maxResolutionSize);\n+\t\t\tdata->properties_.set(properties::UnitCellSize, Size(1000, 1000));\n+\n+\t\t\t/* Extends existing controlInfo_ with SoftISP required controls */\n+\t\t\tControlInfoMap::Map controls;\n+\t\t\tfor (const auto &[id, info] : data->controlInfo_)\n+\t\t\t\tcontrols[id] = info;\n+\n+\t\t\t/* \\todo Allow configuration via YAML */\n+\t\t\tcontrols[&controls::AnalogueGain] = ControlInfo(1.0f, 16.0f, 1.0f);\n+\t\t\tcontrols[&controls::ExposureTime] = ControlInfo(100, 33333, 10000);\n+\t\t\tcontrols[&controls::AeEnable] = ControlInfo(false, true, true);\n+\t\t\tcontrols[&controls::AwbEnable] = ControlInfo(false, true, true);\n+\n+\t\t\tdata->controlInfo_ = ControlInfoMap(std::move(controls), controls::controls);\n+\t\t}\n+\n \t\tstd::string id = data->config_.id;\n \t\tstd::shared_ptr<Camera> camera = Camera::create(std::move(data), id, streams);\n \n@@ -434,7 +520,12 @@ bool PipelineHandlerVirtual::initFrameGenerator(Camera *camera)\n \t\t\t [&](ImageFrames &imageFrames) {\n \t\t\t\t for (auto &streamConfig : data->streamConfigs_)\n \t\t\t\t\t streamConfig.frameGenerator = ImageFrameGenerator::create(imageFrames);\n-\t\t\t } },\n+\t\t\t },\n+\t\t\t [&](RawFrames &rawFrames) {\n+\t\t\t\t for (auto &streamConfig : data->streamConfigs_)\n+\t\t\t\t\t streamConfig.frameGenerator = RawFrameGenerator::create(rawFrames);\n+\t\t\t },\n+\t\t },\n \t\t frame);\n \n \tfor (auto &streamConfig : data->streamConfigs_)\ndiff --git a/src/libcamera/pipeline/virtual/virtual.h b/src/libcamera/pipeline/virtual/virtual.h\nindex 215e56fa..48392808 100644\n--- a/src/libcamera/pipeline/virtual/virtual.h\n+++ b/src/libcamera/pipeline/virtual/virtual.h\n@@ -23,11 +23,12 @@\n \n #include \"frame_generator.h\"\n #include \"image_frame_generator.h\"\n+#include \"raw_frame_generator.h\"\n #include \"test_pattern_generator.h\"\n \n namespace libcamera {\n \n-using VirtualFrame = std::variant<TestPattern, ImageFrames>;\n+using VirtualFrame = std::variant<TestPattern, ImageFrames, RawFrames>;\n \n class VirtualCameraData : public Camera::Private,\n \t\t\t public Thread,\n", "prefixes": [ "2/2" ] }