Patch Detail
Show a patch.
GET /api/1.1/patches/21210/?format=api
{ "id": 21210, "url": "https://patchwork.libcamera.org/api/1.1/patches/21210/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21210/", "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": "<20240910044834.2477701-5-chenghaoyang@google.com>", "date": "2024-09-10T04:40:17", "name": "[v12,4/7] libcamera: pipeline: Add test pattern for VirtualPipelineHandler", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "91b4b394567471b8085eb9095d406654c38d1378", "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/21210/mbox/", "series": [ { "id": 4572, "url": "https://patchwork.libcamera.org/api/1.1/series/4572/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4572", "date": "2024-09-10T04:40:13", "name": "Add VirtualPipelineHandler", "version": 12, "mbox": "https://patchwork.libcamera.org/series/4572/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21210/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21210/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 77954C324C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 10 Sep 2024 04:48:54 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0ED0C634FF;\n\tTue, 10 Sep 2024 06:48:54 +0200 (CEST)", "from mail-pf1-x433.google.com (mail-pf1-x433.google.com\n\t[IPv6:2607:f8b0:4864:20::433])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2DFF5634FA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 10 Sep 2024 06:48:48 +0200 (CEST)", "by mail-pf1-x433.google.com with SMTP id\n\td2e1a72fcca58-718e9c8bd83so1449484b3a.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 09 Sep 2024 21:48:48 -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\td2e1a72fcca58-71909092522sm530734b3a.111.2024.09.09.21.48.44\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 09 Sep 2024 21:48:45 -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=\"cVtu5/T/\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1725943726; x=1726548526;\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=HDvb1itZLf6WF1HydC9Pbb+9xPx02v6IWCxArXMrDII=;\n\tb=cVtu5/T/Nm1lbmgmT3Qp6WT/zU72SXiusUT5kUPVSnZxdcGLUHGKEX7+MogxVnx7aJ\n\tHZm+ajcS+nYF5pcCHSlBW/c//DIJsVOAxGr1sNvSTee3Pd1vrGhqdfLBlAg1Lfq0EFol\n\tDkViO/NVJ9dgko4zSmbDs6EflLzSSENJv0f3k=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1725943726; x=1726548526;\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=HDvb1itZLf6WF1HydC9Pbb+9xPx02v6IWCxArXMrDII=;\n\tb=q7zTaSO5MxpZJu55sXnai7N3LyOk0rkHgTNJN48qng19ETwTq+8f8KV5xXJ4YuvpKX\n\tBiNpt/uzJY+F0jxRhBHq9kP+VP1pPtMMQ2fvlaWlJf62aJ29vgcbJdS3DmT+TLshiDKh\n\tfWpVhC2hE88cxjaDXQ2Tc5LkJzW3nASHI5ZHCnDx+nHZM0y7plFGZCl9DCN29Wnu8KKi\n\tFzmggJrk3oGTq4jwS+S+r6aeeF2iD2Ry5hQ/4XUxIIyjRZgl6uKaBP4tiEhQmuPNFNk2\n\t96TyrxndBcQRFJncMvNGnzPTJla1AT0T0eE6GOpxHK3SZzMAQqHVJ7SV6tXeOFN5qJWa\n\tXm/g==", "X-Gm-Message-State": "AOJu0Yy5acXypar0P6ec7SgG7ieMnEqJSIJ30HNWCzcDlicvCToAqWK4\n\tuQ3+4o6h4eNi2UvVYSsEQhBlR3TMM60WNH/z5ZGZ9TQU3e+5tcat8AdmMPH5sz5slbI1Rs4z8pg\n\t=", "X-Google-Smtp-Source": "AGHT+IFTQ2DYtzSDw5q6EDWtcWSvjwl0w93KUzKjjkR8K66ULqRWD9nle5w6MGDGF1G+7twwcXdJRw==", "X-Received": "by 2002:a05:6a21:10f:b0:1cf:49a6:992a with SMTP id\n\tadf61e73a8af0-1cf500c93f2mr2988679637.21.1725943726132; \n\tMon, 09 Sep 2024 21:48:46 -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>,\n\tJacopo Mondi <jacopo.mondi@ideasonboard.com>", "Subject": "[PATCH v12 4/7] libcamera: pipeline: Add test pattern for\n\tVirtualPipelineHandler", "Date": "Tue, 10 Sep 2024 04:40:17 +0000", "Message-ID": "<20240910044834.2477701-5-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.46.0.598.g6f2099f65c-goog", "In-Reply-To": "<20240910044834.2477701-1-chenghaoyang@google.com>", "References": "<20240910044834.2477701-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\nAdd a test pattern generator class hierarchy for the Virtual\npipeline handler.\n\nImplement two types of test patterns: color bars and diagonal lines\ngenerator and use them in the Virtual pipeline handler.\n\nA shifting mechanism is enabled. For each frame, the image is shifted to\nthe left by 1 pixel. It drops FPS though.\n\nAdd a dependency for libyuv to the build system to generate images\nin NV12 format from the test pattern.\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>\nReviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n---\n src/android/meson.build | 19 ---\n .../pipeline/virtual/frame_generator.h | 29 ++++\n src/libcamera/pipeline/virtual/meson.build | 3 +\n .../virtual/test_pattern_generator.cpp | 135 ++++++++++++++++++\n .../pipeline/virtual/test_pattern_generator.h | 53 +++++++\n src/libcamera/pipeline/virtual/virtual.cpp | 38 ++++-\n src/libcamera/pipeline/virtual/virtual.h | 5 +\n src/meson.build | 19 +++\n 8 files changed, 279 insertions(+), 22 deletions(-)\n create mode 100644 src/libcamera/pipeline/virtual/frame_generator.h\n create mode 100644 src/libcamera/pipeline/virtual/test_pattern_generator.cpp\n create mode 100644 src/libcamera/pipeline/virtual/test_pattern_generator.h", "diff": "diff --git a/src/android/meson.build b/src/android/meson.build\nindex 68646120..6341ee8b 100644\n--- a/src/android/meson.build\n+++ b/src/android/meson.build\n@@ -15,25 +15,6 @@ foreach dep : android_deps\n endif\n endforeach\n \n-libyuv_dep = dependency('libyuv', required : false)\n-\n-# Fallback to a subproject if libyuv isn't found, as it's typically not\n-# provided by distributions.\n-if not libyuv_dep.found()\n- cmake = import('cmake')\n-\n- libyuv_vars = cmake.subproject_options()\n- libyuv_vars.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'})\n- libyuv_vars.set_override_option('cpp_std', 'c++17')\n- libyuv_vars.append_compile_args('cpp',\n- '-Wno-sign-compare',\n- '-Wno-unused-variable',\n- '-Wno-unused-parameter')\n- libyuv_vars.append_link_args('-ljpeg')\n- libyuv = cmake.subproject('libyuv', options : libyuv_vars)\n- libyuv_dep = libyuv.dependency('yuv')\n-endif\n-\n android_deps += [libyuv_dep]\n \n android_hal_sources = files([\ndiff --git a/src/libcamera/pipeline/virtual/frame_generator.h b/src/libcamera/pipeline/virtual/frame_generator.h\nnew file mode 100644\nindex 00000000..d8727b8f\n--- /dev/null\n+++ b/src/libcamera/pipeline/virtual/frame_generator.h\n@@ -0,0 +1,29 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Google Inc.\n+ *\n+ * frame_generator.h - Virtual cameras helper to generate frames\n+ */\n+\n+#pragma once\n+\n+#include <libcamera/framebuffer.h>\n+#include <libcamera/geometry.h>\n+\n+namespace libcamera {\n+\n+class FrameGenerator\n+{\n+public:\n+\tvirtual ~FrameGenerator() = default;\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+\n+protected:\n+\tFrameGenerator() {}\n+};\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/virtual/meson.build b/src/libcamera/pipeline/virtual/meson.build\nindex ada1b335..0c537777 100644\n--- a/src/libcamera/pipeline/virtual/meson.build\n+++ b/src/libcamera/pipeline/virtual/meson.build\n@@ -1,5 +1,8 @@\n # SPDX-License-Identifier: CC0-1.0\n \n libcamera_internal_sources += files([\n+ 'test_pattern_generator.cpp',\n 'virtual.cpp',\n ])\n+\n+libcamera_deps += [libyuv_dep]\ndiff --git a/src/libcamera/pipeline/virtual/test_pattern_generator.cpp b/src/libcamera/pipeline/virtual/test_pattern_generator.cpp\nnew file mode 100644\nindex 00000000..f84ab2f3\n--- /dev/null\n+++ b/src/libcamera/pipeline/virtual/test_pattern_generator.cpp\n@@ -0,0 +1,135 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Google Inc.\n+ *\n+ * test_pattern_generator.cpp - Derived class of FrameGenerator for\n+ * generating test patterns\n+ */\n+\n+#include \"test_pattern_generator.h\"\n+\n+#include <libcamera/base/log.h>\n+\n+#include \"libcamera/internal/mapped_framebuffer.h\"\n+\n+#include <libyuv/convert_from_argb.h>\n+\n+namespace libcamera {\n+\n+LOG_DECLARE_CATEGORY(Virtual)\n+\n+static const unsigned int kARGBSize = 4;\n+\n+void TestPatternGenerator::generateFrame(const Size &size,\n+\t\t\t\t\t const FrameBuffer *buffer)\n+{\n+\tMappedFrameBuffer mappedFrameBuffer(buffer,\n+\t\t\t\t\t MappedFrameBuffer::MapFlag::Write);\n+\n+\tauto planes = mappedFrameBuffer.planes();\n+\n+\tshiftLeft(size);\n+\n+\t/* Convert the template_ to the frame buffer */\n+\tint ret = libyuv::ARGBToNV12(template_.get(), size.width * kARGBSize,\n+\t\t\t\t planes[0].begin(), size.width,\n+\t\t\t\t planes[1].begin(), size.width,\n+\t\t\t\t size.width, size.height);\n+\tif (ret != 0)\n+\t\tLOG(Virtual, Error) << \"ARGBToNV12() failed with \" << ret;\n+}\n+\n+void TestPatternGenerator::shiftLeft(const Size &size)\n+{\n+\t/* Store the first column temporarily */\n+\tauto firstColumn = std::make_unique<uint8_t[]>(size.height * kARGBSize);\n+\tfor (size_t h = 0; h < size.height; h++) {\n+\t\tunsigned int index = h * size.width * kARGBSize;\n+\t\tunsigned int index1 = h * kARGBSize;\n+\t\tfirstColumn[index1] = template_[index];\n+\t\tfirstColumn[index1 + 1] = template_[index + 1];\n+\t\tfirstColumn[index1 + 2] = template_[index + 2];\n+\t\tfirstColumn[index1 + 3] = 0x00;\n+\t}\n+\n+\t/* Overwrite template_ */\n+\tuint8_t *buf = template_.get();\n+\tfor (size_t h = 0; h < size.height; h++) {\n+\t\tfor (size_t w = 0; w < size.width - 1; w++) {\n+\t\t\t/* Overwrite with the pixel on the right */\n+\t\t\tunsigned int index = (h * size.width + w + 1) * kARGBSize;\n+\t\t\t*buf++ = template_[index]; /* B */\n+\t\t\t*buf++ = template_[index + 1]; /* G */\n+\t\t\t*buf++ = template_[index + 2]; /* R */\n+\t\t\t*buf++ = 0x00; /* A */\n+\t\t}\n+\t\t/* Overwrite the new last column with the original first column */\n+\t\tunsigned int index1 = h * kARGBSize;\n+\t\t*buf++ = firstColumn[index1]; /* B */\n+\t\t*buf++ = firstColumn[index1 + 1]; /* G */\n+\t\t*buf++ = firstColumn[index1 + 2]; /* R */\n+\t\t*buf++ = 0x00; /* A */\n+\t}\n+}\n+\n+void ColorBarsGenerator::configure(const Size &size)\n+{\n+\tconstexpr uint8_t kColorBar[8][3] = {\n+\t\t/* R, G, B */\n+\t\t{ 0xff, 0xff, 0xff }, /* White */\n+\t\t{ 0xff, 0xff, 0x00 }, /* Yellow */\n+\t\t{ 0x00, 0xff, 0xff }, /* Cyan */\n+\t\t{ 0x00, 0xff, 0x00 }, /* Green */\n+\t\t{ 0xff, 0x00, 0xff }, /* Magenta */\n+\t\t{ 0xff, 0x00, 0x00 }, /* Red */\n+\t\t{ 0x00, 0x00, 0xff }, /* Blue */\n+\t\t{ 0x00, 0x00, 0x00 }, /* Black */\n+\t};\n+\n+\ttemplate_ = std::make_unique<uint8_t[]>(\n+\t\tsize.width * size.height * kARGBSize);\n+\n+\tunsigned int colorBarWidth = size.width / std::size(kColorBar);\n+\n+\tuint8_t *buf = template_.get();\n+\tfor (size_t h = 0; h < size.height; h++) {\n+\t\tfor (size_t w = 0; w < size.width; w++) {\n+\t\t\t/* Repeat when the width is exceed */\n+\t\t\tunsigned int index = (w / colorBarWidth) % std::size(kColorBar);\n+\n+\t\t\t*buf++ = kColorBar[index][2]; /* B */\n+\t\t\t*buf++ = kColorBar[index][1]; /* G */\n+\t\t\t*buf++ = kColorBar[index][0]; /* R */\n+\t\t\t*buf++ = 0x00; /* A */\n+\t\t}\n+\t}\n+}\n+\n+void DiagonalLinesGenerator::configure(const Size &size)\n+{\n+\tconstexpr uint8_t kColorBar[8][3] = {\n+\t\t/* R, G, B */\n+\t\t{ 0xff, 0xff, 0xff }, /* White */\n+\t\t{ 0x00, 0x00, 0x00 }, /* Black */\n+\t};\n+\n+\ttemplate_ = std::make_unique<uint8_t[]>(\n+\t\tsize.width * size.height * kARGBSize);\n+\n+\tunsigned int lineWidth = size.width / 10;\n+\n+\tuint8_t *buf = template_.get();\n+\tfor (size_t h = 0; h < size.height; h++) {\n+\t\tfor (size_t w = 0; w < size.width; w++) {\n+\t\t\t/* Repeat when the width is exceed */\n+\t\t\tint index = ((w + h) / lineWidth) % 2;\n+\n+\t\t\t*buf++ = kColorBar[index][2]; /* B */\n+\t\t\t*buf++ = kColorBar[index][1]; /* G */\n+\t\t\t*buf++ = kColorBar[index][0]; /* R */\n+\t\t\t*buf++ = 0x00; /* A */\n+\t\t}\n+\t}\n+}\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/virtual/test_pattern_generator.h b/src/libcamera/pipeline/virtual/test_pattern_generator.h\nnew file mode 100644\nindex 00000000..b8bbe0b8\n--- /dev/null\n+++ b/src/libcamera/pipeline/virtual/test_pattern_generator.h\n@@ -0,0 +1,53 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2024, Google Inc.\n+ *\n+ * test_pattern_generator.h - Derived class of FrameGenerator for\n+ * generating test patterns\n+ */\n+\n+#pragma once\n+\n+#include <memory>\n+\n+#include <libcamera/framebuffer.h>\n+#include <libcamera/geometry.h>\n+\n+#include \"frame_generator.h\"\n+\n+namespace libcamera {\n+\n+enum class TestPattern : char {\n+\tColorBars = 0,\n+\tDiagonalLines = 1,\n+};\n+\n+class TestPatternGenerator : public FrameGenerator\n+{\n+public:\n+\tvoid generateFrame(const Size &size, const FrameBuffer *buffer) override;\n+\n+protected:\n+\t/* Buffer of test pattern template */\n+\tstd::unique_ptr<uint8_t[]> template_;\n+\n+private:\n+\t/* Shift the buffer by 1 pixel left each frame */\n+\tvoid shiftLeft(const Size &size);\n+};\n+\n+class ColorBarsGenerator : public TestPatternGenerator\n+{\n+public:\n+\t/* Generate a template buffer of the color bar test pattern. */\n+\tvoid configure(const Size &size) override;\n+};\n+\n+class DiagonalLinesGenerator : public TestPatternGenerator\n+{\n+public:\n+\t/* Generate a template buffer of the diagonal lines test pattern. */\n+\tvoid configure(const Size &size) override;\n+};\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/virtual/virtual.cpp b/src/libcamera/pipeline/virtual/virtual.cpp\nindex 56e05528..4e9a6973 100644\n--- a/src/libcamera/pipeline/virtual/virtual.cpp\n+++ b/src/libcamera/pipeline/virtual/virtual.cpp\n@@ -84,6 +84,8 @@ private:\n \t\treturn static_cast<VirtualCameraData *>(camera->_d());\n \t}\n \n+\tvoid initFrameGenerator(Camera *camera);\n+\n \tDmaBufAllocator dmaBufAllocator_;\n };\n \n@@ -218,8 +220,10 @@ int PipelineHandlerVirtual::configure(Camera *camera,\n \t\t\t\t CameraConfiguration *config)\n {\n \tVirtualCameraData *data = cameraData(camera);\n-\tfor (auto [i, c] : utils::enumerate(*config))\n+\tfor (auto [i, c] : utils::enumerate(*config)) {\n \t\tc.setStream(&data->streamConfigs_[i].stream);\n+\t\tdata->streamConfigs_[i].frameGenerator->configure(c.size);\n+\t}\n \n \treturn 0;\n }\n@@ -255,9 +259,23 @@ void PipelineHandlerVirtual::stopDevice([[maybe_unused]] Camera *camera)\n int PipelineHandlerVirtual::queueRequestDevice([[maybe_unused]] Camera *camera,\n \t\t\t\t\t Request *request)\n {\n+\tVirtualCameraData *data = cameraData(camera);\n+\n \t/* \\todo Read from the virtual video if any. */\n-\tfor (auto it : request->buffers())\n-\t\tcompleteBuffer(request, it.second);\n+\tfor (auto const &[stream, buffer] : request->buffers()) {\n+\t\tbool found = false;\n+\t\t/* map buffer and fill test patterns */\n+\t\tfor (auto &streamConfig : data->streamConfigs_) {\n+\t\t\tif (stream == &streamConfig.stream) {\n+\t\t\t\tfound = true;\n+\t\t\t\tstreamConfig.frameGenerator->generateFrame(\n+\t\t\t\t\tstream->configuration().size, buffer);\n+\t\t\t\tcompleteBuffer(request, buffer);\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\t\tASSERT(found);\n+\t}\n \n \trequest->metadata().set(controls::SensorTimestamp, currentTimestamp());\n \tcompleteRequest(request);\n@@ -299,11 +317,25 @@ bool PipelineHandlerVirtual::match([[maybe_unused]] DeviceEnumerator *enumerator\n \n \tconst std::string id = \"Virtual0\";\n \tstd::shared_ptr<Camera> camera = Camera::create(std::move(data), id, streams);\n+\n+\tinitFrameGenerator(camera.get());\n+\n \tregisterCamera(std::move(camera));\n \n \treturn true;\n }\n \n+void PipelineHandlerVirtual::initFrameGenerator(Camera *camera)\n+{\n+\tauto data = cameraData(camera);\n+\tfor (auto &streamConfig : data->streamConfigs_) {\n+\t\tif (data->testPattern_ == TestPattern::DiagonalLines)\n+\t\t\tstreamConfig.frameGenerator = std::make_unique<DiagonalLinesGenerator>();\n+\t\telse\n+\t\t\tstreamConfig.frameGenerator = std::make_unique<ColorBarsGenerator>();\n+\t}\n+}\n+\n REGISTER_PIPELINE_HANDLER(PipelineHandlerVirtual, \"virtual\")\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/virtual/virtual.h b/src/libcamera/pipeline/virtual/virtual.h\nindex 77823c41..acdd437e 100644\n--- a/src/libcamera/pipeline/virtual/virtual.h\n+++ b/src/libcamera/pipeline/virtual/virtual.h\n@@ -14,6 +14,8 @@\n #include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n \n+#include \"test_pattern_generator.h\"\n+\n namespace libcamera {\n \n class VirtualCameraData : public Camera::Private\n@@ -27,6 +29,7 @@ public:\n \t};\n \tstruct StreamConfig {\n \t\tStream stream;\n+\t\tstd::unique_ptr<FrameGenerator> frameGenerator;\n \t};\n \n \tVirtualCameraData(PipelineHandler *pipe,\n@@ -34,6 +37,8 @@ public:\n \n \t~VirtualCameraData() = default;\n \n+\tTestPattern testPattern_ = TestPattern::ColorBars;\n+\n \tconst std::vector<Resolution> supportedResolutions_;\n \tSize maxResolutionSize_;\n \tSize minResolutionSize_;\ndiff --git a/src/meson.build b/src/meson.build\nindex 165a77bb..91bea775 100644\n--- a/src/meson.build\n+++ b/src/meson.build\n@@ -27,6 +27,25 @@ else\n ipa_sign_module = false\n endif\n \n+libyuv_dep = dependency('libyuv', required : false)\n+\n+# Fallback to a subproject if libyuv isn't found, as it's typically not\n+# provided by distributions.\n+if not libyuv_dep.found()\n+ cmake = import('cmake')\n+\n+ libyuv_vars = cmake.subproject_options()\n+ libyuv_vars.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'})\n+ libyuv_vars.set_override_option('cpp_std', 'c++17')\n+ libyuv_vars.append_compile_args('cpp',\n+ '-Wno-sign-compare',\n+ '-Wno-unused-variable',\n+ '-Wno-unused-parameter')\n+ libyuv_vars.append_link_args('-ljpeg')\n+ libyuv = cmake.subproject('libyuv', options : libyuv_vars)\n+ libyuv_dep = libyuv.dependency('yuv')\n+endif\n+\n # libcamera must be built first as a dependency to the other components.\n subdir('libcamera')\n \n", "prefixes": [ "v12", "4/7" ] }