{"id":21052,"url":"https://patchwork.libcamera.org/api/1.1/patches/21052/?format=json","web_url":"https://patchwork.libcamera.org/patch/21052/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20240829195703.1456614-5-chenghaoyang@chromium.org>","date":"2024-08-29T19:47:43","name":"[v10,4/7] libcamera: pipeline: Add test pattern for VirtualPipelineHandler","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6c0f76acdb55466ab45fa949491d0cf7ba883200","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/1.1/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21052/mbox/","series":[{"id":4547,"url":"https://patchwork.libcamera.org/api/1.1/series/4547/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4547","date":"2024-08-29T19:47:39","name":"Add VirtualPipelineHandler","version":10,"mbox":"https://patchwork.libcamera.org/series/4547/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21052/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21052/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 7CC1DC323E\n\tfor ;\n\tThu, 29 Aug 2024 19:57:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 21E3163486;\n\tThu, 29 Aug 2024 21:57:21 +0200 (CEST)","from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com\n\t[IPv6:2a00:1450:4864:20::42f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4406063456\n\tfor ;\n\tThu, 29 Aug 2024 21:57:10 +0200 (CEST)","by mail-wr1-x42f.google.com with SMTP id\n\tffacd0b85a97d-37186c2278bso1176600f8f.1\n\tfor ;\n\tThu, 29 Aug 2024 12:57:10 -0700 (PDT)","from chenghaoyang-germany.c.googlers.com.com\n\t(161.126.77.34.bc.googleusercontent.com. [34.77.126.161])\n\tby smtp.gmail.com with ESMTPSA id\n\t5b1f17b1804b1-42ba7b4271fsm54602805e9.29.2024.08.29.12.57.08\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 29 Aug 2024 12:57:08 -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=\"OYtKxLMM\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1724961429; x=1725566229;\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=eDdOJNBfN1Q9u3EgerR9sPOU2V44OMCOmwM8jfeXUn8=;\n\tb=OYtKxLMMc0xgJeYio6UZrZ5NnfMu8x28AwcmMNNxvkM+2iyHyrEAkLpQOCbrBwEHT5\n\t5xXnOLN4DcHnEehphcRM7uxWMrsBp91tgxb86owulRaVF0SchQpQkrqPYk9WzLBP/8R1\n\t4+dD37Vrga5jhRB6HlbignSFETQf9zuxBkVYo=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1724961429; x=1725566229;\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=eDdOJNBfN1Q9u3EgerR9sPOU2V44OMCOmwM8jfeXUn8=;\n\tb=qixGOLnLuRkhCqyfNc/B7gcRKdBmC3vouyBc3Kf9T0IoyAiQ/4VSVy/coQzfGtQUN8\n\tbx/R0+KuOtvXhkp2LxbR03I7h+/ijVOgoYvysDQBKo4DRY3OfVSm67qM9qWe41XZ82Jj\n\txI16twSmUQjwkxSvixlPvT5mMnkceqWdqcg84rAl07rZBeAglXb74D8xgrFR+/92zVaz\n\tRFeeiB7JA3PIs86MN4FHyTbBfY6Zt1srI8lLdLKRid5v+zxQrWy7Zg3yWE0U5nUyIACB\n\tHW9xt54kXcmV2xYJ4Jw8AX0bot4o3MxFWfu51HGaQupssZbMCiRtrPV7VJ2Qs7GCmfEv\n\tzP/A==","X-Gm-Message-State":"AOJu0YyG3MmqyifReFSdi/E5HgDOQ117V/N9ao2fpMF8h1YbWp6MiVOd\n\tx/RrhfieYfVaKfR4wC+Hw7VoAfMPIb102iB/FLrcJ0e2ss4hW8725dNuDVmjIoqPrvF9+Pxv0dS\n\t/mQ==","X-Google-Smtp-Source":"AGHT+IFPbx9BoKh5oQPHsp77QUmBhNSMOuZ2M1esTd74IO0C1eC67dXzfM9wOgKkpL663Ou8TVqZqw==","X-Received":"by 2002:adf:fd0a:0:b0:371:6fcf:5256 with SMTP id\n\tffacd0b85a97d-3749c1de10fmr2012175f8f.18.1724961429410; \n\tThu, 29 Aug 2024 12:57:09 -0700 (PDT)","From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Konami Shu , Harvey Yang ,\n\tYunke Cao , Tomasz Figa ","Subject":"[PATCH v10 4/7] libcamera: pipeline: Add test pattern for\n\tVirtualPipelineHandler","Date":"Thu, 29 Aug 2024 19:47:43 +0000","Message-ID":"<20240829195703.1456614-5-chenghaoyang@chromium.org>","X-Mailer":"git-send-email 2.46.0.469.g59c65b2a67-goog","In-Reply-To":"<20240829195703.1456614-1-chenghaoyang@chromium.org>","References":"<20240829195703.1456614-1-chenghaoyang@chromium.org>","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\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 \n\nlibcamera: pipeline: Shift test pattern by 1 pixel left every frame\n\n- This write the buffer every frame\n- Shifting makes the frame rate dropped from about 160 to 40\n\nPatchset1->2\n- Use constant instead of using a magic number\n\nPatchset2->3\n- Make shiftLeft() private\n\nSigned-off-by: Konami Shu \nCo-developed-by: Harvey Yang \nCo-developed-by: Yunke Cao \nCo-developed-by: Tomasz Figa \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 | 140 ++++++++++++++++++\n .../pipeline/virtual/test_pattern_generator.h | 57 +++++++\n src/libcamera/pipeline/virtual/virtual.cpp | 38 ++++-\n src/libcamera/pipeline/virtual/virtual.h | 7 +\n src/meson.build | 19 +++\n 8 files changed, 290 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 68646120a..6341ee8b0 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 000000000..d8727b8f3\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 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 ada1b3358..0c537777f 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 000000000..7094818e5\n--- /dev/null\n+++ b/src/libcamera/pipeline/virtual/test_pattern_generator.cpp\n@@ -0,0 +1,140 @@\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 \"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(\n+\t\ttemplate_.get(), size.width * kARGBSize,\n+\t\tplanes[0].begin(), size.width,\n+\t\tplanes[1].begin(), size.width,\n+\t\tsize.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(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+ColorBarsGenerator::ColorBarsGenerator() = default;\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+DiagonalLinesGenerator::DiagonalLinesGenerator() = default;\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 000000000..11bcb5f04\n--- /dev/null\n+++ b/src/libcamera/pipeline/virtual/test_pattern_generator.h\n@@ -0,0 +1,57 @@\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+\tvoid 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+\tColorBarsGenerator();\n+\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+\tDiagonalLinesGenerator();\n+\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 d4e3f60ad..690d72a22 100644\n--- a/src/libcamera/pipeline/virtual/virtual.cpp\n+++ b/src/libcamera/pipeline/virtual/virtual.cpp\n@@ -167,8 +167,11 @@ int PipelineHandlerVirtual::configure(Camera *camera,\n \t\t\t\t CameraConfiguration *config)\n {\n \tVirtualCameraData *data = cameraData(camera);\n-\tfor (size_t i = 0; i < config->size(); ++i)\n+\tfor (size_t i = 0; i < config->size(); ++i) {\n \t\tconfig->at(i).setStream(&data->streamConfigs_[i].stream);\n+\t\tdata->streamConfigs_[i].frameGenerator->configure(\n+\t\t\tdata->streamConfigs_[i].stream.configuration().size);\n+\t}\n \n \treturn 0;\n }\n@@ -204,9 +207,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+\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\tif (!found)\n+\t\t\tLOG(Virtual, Fatal) << \"Stream not defined\";\n+\t}\n \n \trequest->metadata().set(controls::SensorTimestamp, currentTimestamp());\n \tcompleteRequest(request);\n@@ -251,11 +269,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 fb3dbcad3..79c951a06 100644\n--- a/src/libcamera/pipeline/virtual/virtual.h\n+++ b/src/libcamera/pipeline/virtual/virtual.h\n@@ -16,6 +16,8 @@\n #include \"libcamera/internal/dma_buf_allocator.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@@ -29,6 +31,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@@ -36,6 +39,8 @@ public:\n \n \t~VirtualCameraData() = default;\n \n+\tTestPattern testPattern_;\n+\n \tconst std::vector supportedResolutions_;\n \tSize maxResolutionSize_;\n \tSize minResolutionSize_;\n@@ -83,6 +88,8 @@ private:\n \t\treturn static_cast(camera->_d());\n \t}\n \n+\tvoid initFrameGenerator(Camera *camera);\n+\n \tDmaBufAllocator dmaBufAllocator_;\n };\n \ndiff --git a/src/meson.build b/src/meson.build\nindex 165a77bb9..91bea7753 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":["v10","4/7"]}