{"id":21418,"url":"https://patchwork.libcamera.org/api/patches/21418/?format=json","web_url":"https://patchwork.libcamera.org/patch/21418/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20240930063342.3014837-5-chenghaoyang@google.com>","date":"2024-09-30T06:29:45","name":"[v14,4/7] libcamera: pipeline: Add test pattern for VirtualPipelineHandler","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"8ac039cf1dae666403c7ac2cc5814f2761015a60","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21418/mbox/","series":[{"id":4637,"url":"https://patchwork.libcamera.org/api/series/4637/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4637","date":"2024-09-30T06:29:41","name":"Add VirtualPipelineHandler","version":14,"mbox":"https://patchwork.libcamera.org/series/4637/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21418/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21418/checks/","tags":{},"headers":{"Return-Path":"","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 9C713C3257\n\tfor ;\n\tMon, 30 Sep 2024 06:34:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DA10D6351F;\n\tMon, 30 Sep 2024 08:34:08 +0200 (CEST)","from mail-oi1-x235.google.com (mail-oi1-x235.google.com\n\t[IPv6:2607:f8b0:4864:20::235])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 720BC63510\n\tfor ;\n\tMon, 30 Sep 2024 08:33:56 +0200 (CEST)","by mail-oi1-x235.google.com with SMTP id\n\t5614622812f47-3e034fac53bso1797220b6e.3\n\tfor ;\n\tSun, 29 Sep 2024 23:33:56 -0700 (PDT)","from chenghaoyang-low.c.googlers.com.com\n\t(208.158.221.35.bc.googleusercontent.com. [35.221.158.208])\n\tby smtp.gmail.com with ESMTPSA id\n\td2e1a72fcca58-71b265166e2sm5487671b3a.131.2024.09.29.23.33.52\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSun, 29 Sep 2024 23:33:53 -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=\"X/mWYTXV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1727678035; x=1728282835;\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=VuU4cGIN+faXvAvU9Paf7WKxATqLyOfcBxu4BApn4rU=;\n\tb=X/mWYTXV1cr2EJ631St+h44Rt6qv9bKyfmnmEXhlZ6+f4TZKGUBG+rwwg3Zyxaf4Pt\n\tlN22XsGiu+Rq2LEq/me6UcoLbfXU5VmzFVDdy+jhaGSbbpcW1wAk6E8X0zmhw5wMC3Q8\n\tO9HcpjMxohjvKFzByz3uqUeVUXfYXWyQG9nqg=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1727678035; x=1728282835;\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=VuU4cGIN+faXvAvU9Paf7WKxATqLyOfcBxu4BApn4rU=;\n\tb=MPGFHjOPkOynKBo1U+1QBTBbNfRXgUqb23Bn3/rwowt7xagFZEqNmBnAbXS1ip/rPE\n\tCiX5mCcnyLsqTc/+n9l5uWnHrvBhFHRJdBMyITucbfVnhmY9geo4Z0ciH2eRx6p8hjbU\n\tuCvq8t8ql8DDLk8mNOMZeCMaGVwYD3Pu5zWcm7vKBnOV3lyEdcRKmJAHPaGhhQqQeGz1\n\tRQEgE9MouCFgHsbhs8Yj2E7wd62cDeXhy5S/k835srdDK0Q8AE397fZQD3+FhvVD4/Of\n\tAU7AxWerDgZ/veVt1yMy1F+sAtG0WwLXUbsoWI3G/T/+u3xD0GUcZyOhTMx5334NK4Y1\n\tCkdg==","X-Gm-Message-State":"AOJu0YyaUXkS+JMiai5MDvjfYJHA/EgsiQzaYVusqBg9Ul5gW4yvUjTh\n\tjHQp2OXDj9wUd/FFQmIpAsvO3u6MKuQyrRezDncXUZb4h+dRZdW+tqLSQl9CMkDlhhq+4iN3pkA\n\t=","X-Google-Smtp-Source":"AGHT+IE6yzoGzqDi3co52DpWrJU2trLq1s23WaydgrYE4i9Jg5+CPDw82xm+4Cx0nM+bkQgSz2H0zw==","X-Received":"by 2002:a05:6808:2106:b0:3e2:8c58:6025 with SMTP id\n\t5614622812f47-3e3939e8078mr5566149b6e.43.1727678034625; \n\tSun, 29 Sep 2024 23:33:54 -0700 (PDT)","From":"Harvey Yang ","X-Google-Original-From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Konami Shu , Harvey Yang ,\n\tYunke Cao , Tomasz Figa ,\n\tJacopo Mondi ","Subject":"[PATCH v14 4/7] libcamera: pipeline: Add test pattern for\n\tVirtualPipelineHandler","Date":"Mon, 30 Sep 2024 06:29:45 +0000","Message-ID":"<20240930063342.3014837-5-chenghaoyang@google.com>","X-Mailer":"git-send-email 2.46.1.824.gd892dcdcdd-goog","In-Reply-To":"<20240930063342.3014837-1-chenghaoyang@google.com>","References":"<20240930063342.3014837-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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Konami Shu \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 \nCo-developed-by: Harvey Yang \nCo-developed-by: Yunke Cao \nCo-developed-by: Tomasz Figa \nReviewed-by: Jacopo Mondi \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 | 137 ++++++++++++++++++\n .../pipeline/virtual/test_pattern_generator.h | 53 +++++++\n src/libcamera/pipeline/virtual/virtual.cpp | 41 +++++-\n src/libcamera/pipeline/virtual/virtual.h | 5 +\n src/meson.build | 19 +++\n 8 files changed, 284 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..4ff41dd8\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 \n+#include \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 int 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..c5a93d37\n--- /dev/null\n+++ b/src/libcamera/pipeline/virtual/test_pattern_generator.cpp\n@@ -0,0 +1,137 @@\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 \n+\n+#include \"libcamera/internal/mapped_framebuffer.h\"\n+\n+#include \n+\n+namespace libcamera {\n+\n+LOG_DECLARE_CATEGORY(Virtual)\n+\n+static const unsigned int kARGBSize = 4;\n+\n+int TestPatternGenerator::generateFrame(const Size &size,\n+\t\t\t\t\tconst 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+\treturn ret;\n+}\n+\n+void TestPatternGenerator::shiftLeft(const Size &size)\n+{\n+\t/* Store the first column temporarily */\n+\tauto firstColumn = std::make_unique(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(\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(\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..2ff1e40e\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 \n+\n+#include \n+#include \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+\tint generateFrame(const Size &size, const FrameBuffer *buffer) override;\n+\n+protected:\n+\t/* Buffer of test pattern template */\n+\tstd::unique_ptr 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 d1584f59..2b258492 100644\n--- a/src/libcamera/pipeline/virtual/virtual.cpp\n+++ b/src/libcamera/pipeline/virtual/virtual.cpp\n@@ -34,6 +34,7 @@\n #include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/dma_buf_allocator.h\"\n #include \"libcamera/internal/formats.h\"\n+#include \"libcamera/internal/framebuffer.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n \n namespace libcamera {\n@@ -93,6 +94,8 @@ private:\n \t\treturn static_cast(camera->_d());\n \t}\n \n+\tvoid initFrameGenerator(Camera *camera);\n+\n \tDmaBufAllocator dmaBufAllocator_;\n };\n \n@@ -227,8 +230,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@@ -264,8 +269,24 @@ 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-\tfor (auto it : request->buffers())\n-\t\tcompleteBuffer(request, it.second);\n+\tVirtualCameraData *data = cameraData(camera);\n+\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\tif (streamConfig.frameGenerator->generateFrame(\n+\t\t\t\t\t stream->configuration().size, buffer))\n+\t\t\t\t\tbuffer->_d()->cancel();\n+\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@@ -307,11 +328,25 @@ bool PipelineHandlerVirtual::match([[maybe_unused]] DeviceEnumerator *enumerator\n \n \tconst std::string id = \"Virtual0\";\n \tstd::shared_ptr 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();\n+\t\telse\n+\t\t\tstreamConfig.frameGenerator = std::make_unique();\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 4df70a13..9b79ac09 100644\n--- a/src/libcamera/pipeline/virtual/virtual.h\n+++ b/src/libcamera/pipeline/virtual/virtual.h\n@@ -15,6 +15,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@@ -28,6 +30,7 @@ public:\n \t};\n \tstruct StreamConfig {\n \t\tStream stream;\n+\t\tstd::unique_ptr frameGenerator;\n \t};\n \n \tVirtualCameraData(PipelineHandler *pipe,\n@@ -35,6 +38,8 @@ public:\n \n \t~VirtualCameraData() = default;\n \n+\tTestPattern testPattern_ = TestPattern::ColorBars;\n+\n \tconst std::vector 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":["v14","4/7"]}