[PATCH v7 4/7] libcamera: pipeline: Add test pattern for VirtualPipelineHandler
Harvey Yang
chenghaoyang at chromium.org
Thu Aug 1 09:31:00 CEST 2024
From: Konami Shu <konamiz at google.com>
- There are two test patterns: color bars and diagonal lines
- Add class for generating test patterns
- Add libyuv to build dependencies
- Make VirtualPipelineHandler show the test pattern
- Format the code
- Rename test_pattern to frame_generator
- reflect comment
- Fix const variable name
- Use #pragma once
- Make configure() private
Signed-off-by: Konami Shu <konamiz at google.com>
Co-developed-by: Harvey Yang <chenghaoyang at chromium.org>
Co-developed-by: Yunke Cao <yunkec at chromium.org>
Co-developed-by: Tomasz Figa <tfiga at chromium.org>
---
.../pipeline/virtual/frame_generator.h | 33 ++++++
src/libcamera/pipeline/virtual/meson.build | 22 ++++
.../virtual/test_pattern_generator.cpp | 112 ++++++++++++++++++
.../pipeline/virtual/test_pattern_generator.h | 58 +++++++++
src/libcamera/pipeline/virtual/virtual.cpp | 28 ++++-
src/libcamera/pipeline/virtual/virtual.h | 8 ++
6 files changed, 258 insertions(+), 3 deletions(-)
create mode 100644 src/libcamera/pipeline/virtual/frame_generator.h
create mode 100644 src/libcamera/pipeline/virtual/test_pattern_generator.cpp
create mode 100644 src/libcamera/pipeline/virtual/test_pattern_generator.h
diff --git a/src/libcamera/pipeline/virtual/frame_generator.h b/src/libcamera/pipeline/virtual/frame_generator.h
new file mode 100644
index 00000000..9699af7a
--- /dev/null
+++ b/src/libcamera/pipeline/virtual/frame_generator.h
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2023, Google Inc.
+ *
+ * frame_generator.h - Virtual cameras helper to generate frames
+ */
+
+#pragma once
+
+#include <libcamera/framebuffer.h>
+#include <libcamera/geometry.h>
+
+namespace libcamera {
+
+class FrameGenerator
+{
+public:
+ virtual ~FrameGenerator() = default;
+
+ /* Create buffers for using them in `generateFrame` */
+ virtual void configure(const Size &size) = 0;
+
+ /** Fill the output frame buffer.
+ * Use the frame at the frameCount of image frames
+ */
+ virtual void generateFrame(const Size &size,
+ const FrameBuffer *buffer) = 0;
+
+protected:
+ FrameGenerator() {}
+};
+
+} /* namespace libcamera */
diff --git a/src/libcamera/pipeline/virtual/meson.build b/src/libcamera/pipeline/virtual/meson.build
index ba7ff754..e1e65e68 100644
--- a/src/libcamera/pipeline/virtual/meson.build
+++ b/src/libcamera/pipeline/virtual/meson.build
@@ -2,4 +2,26 @@
libcamera_sources += files([
'virtual.cpp',
+ 'test_pattern_generator.cpp',
])
+
+libyuv_dep = dependency('libyuv', required : false)
+
+# Fallback to a subproject if libyuv isn't found, as it's typically not
+# provided by distributions.
+if not libyuv_dep.found()
+ cmake = import('cmake')
+
+ libyuv_vars = cmake.subproject_options()
+ libyuv_vars.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'})
+ libyuv_vars.set_override_option('cpp_std', 'c++17')
+ libyuv_vars.append_compile_args('cpp',
+ '-Wno-sign-compare',
+ '-Wno-unused-variable',
+ '-Wno-unused-parameter')
+ libyuv_vars.append_link_args('-ljpeg')
+ libyuv = cmake.subproject('libyuv', options : libyuv_vars)
+ libyuv_dep = libyuv.dependency('yuv')
+endif
+
+libcamera_deps += [libyuv_dep]
diff --git a/src/libcamera/pipeline/virtual/test_pattern_generator.cpp b/src/libcamera/pipeline/virtual/test_pattern_generator.cpp
new file mode 100644
index 00000000..8dfe626e
--- /dev/null
+++ b/src/libcamera/pipeline/virtual/test_pattern_generator.cpp
@@ -0,0 +1,112 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2023, Google Inc.
+ *
+ * test_pattern_generator.cpp - Derived class of FrameGenerator for
+ * generating test patterns
+ */
+
+#include "test_pattern_generator.h"
+
+#include <libcamera/base/log.h>
+
+#include "libcamera/internal/mapped_framebuffer.h"
+
+#include "libyuv/convert_from_argb.h"
+namespace libcamera {
+
+LOG_DECLARE_CATEGORY(Virtual)
+
+static const unsigned int kARGBSize = 4;
+
+void TestPatternGenerator::generateFrame(
+ const Size &size,
+ const FrameBuffer *buffer)
+{
+ MappedFrameBuffer mappedFrameBuffer(buffer,
+ MappedFrameBuffer::MapFlag::Write);
+
+ auto planes = mappedFrameBuffer.planes();
+
+ /* Convert the template_ to the frame buffer */
+ int ret = libyuv::ARGBToNV12(
+ template_.get(), /*src_stride_argb=*/size.width * kARGBSize,
+ planes[0].begin(), size.width,
+ planes[1].begin(), size.width,
+ size.width, size.height);
+ if (ret != 0) {
+ LOG(Virtual, Error) << "ARGBToNV12() failed with " << ret;
+ }
+}
+
+std::unique_ptr<ColorBarsGenerator> ColorBarsGenerator::create()
+{
+ return std::make_unique<ColorBarsGenerator>();
+}
+
+void ColorBarsGenerator::configure(const Size &size)
+{
+ constexpr uint8_t kColorBar[8][3] = {
+ // R, G, B
+ { 0xff, 0xff, 0xff }, // White
+ { 0xff, 0xff, 0x00 }, // Yellow
+ { 0x00, 0xff, 0xff }, // Cyan
+ { 0x00, 0xff, 0x00 }, // Green
+ { 0xff, 0x00, 0xff }, // Magenta
+ { 0xff, 0x00, 0x00 }, // Red
+ { 0x00, 0x00, 0xff }, // Blue
+ { 0x00, 0x00, 0x00 }, // Black
+ };
+
+ template_ = std::make_unique<uint8_t[]>(
+ size.width * size.height * kARGBSize);
+
+ unsigned int colorBarWidth = size.width / std::size(kColorBar);
+
+ uint8_t *buf = template_.get();
+ for (size_t h = 0; h < size.height; h++) {
+ for (size_t w = 0; w < size.width; w++) {
+ // repeat when the width is exceed
+ int index = (w / colorBarWidth) % std::size(kColorBar);
+
+ *buf++ = kColorBar[index][2]; // B
+ *buf++ = kColorBar[index][1]; // G
+ *buf++ = kColorBar[index][0]; // R
+ *buf++ = 0x00; // A
+ }
+ }
+}
+
+std::unique_ptr<DiagonalLinesGenerator> DiagonalLinesGenerator::create()
+{
+ return std::make_unique<DiagonalLinesGenerator>();
+}
+
+void DiagonalLinesGenerator::configure(const Size &size)
+{
+ constexpr uint8_t kColorBar[8][3] = {
+ // R, G, B
+ { 0xff, 0xff, 0xff }, // White
+ { 0x00, 0x00, 0x00 }, // Black
+ };
+
+ template_ = std::make_unique<uint8_t[]>(
+ size.width * size.height * kARGBSize);
+
+ unsigned int lineWidth = size.width / 10;
+
+ uint8_t *buf = template_.get();
+ for (size_t h = 0; h < size.height; h++) {
+ for (size_t w = 0; w < size.width; w++) {
+ // repeat when the width is exceed
+ int index = ((w + h) / lineWidth) % 2;
+
+ *buf++ = kColorBar[index][2]; // B
+ *buf++ = kColorBar[index][1]; // G
+ *buf++ = kColorBar[index][0]; // R
+ *buf++ = 0x00; // A
+ }
+ }
+}
+
+} /* namespace libcamera */
diff --git a/src/libcamera/pipeline/virtual/test_pattern_generator.h b/src/libcamera/pipeline/virtual/test_pattern_generator.h
new file mode 100644
index 00000000..ed8d4e43
--- /dev/null
+++ b/src/libcamera/pipeline/virtual/test_pattern_generator.h
@@ -0,0 +1,58 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2023, Google Inc.
+ *
+ * test_pattern_generator.h - Derived class of FrameGenerator for
+ * generating test patterns
+ */
+
+#pragma once
+
+#include <memory>
+
+#include <libcamera/framebuffer.h>
+#include <libcamera/geometry.h>
+
+#include "frame_generator.h"
+
+namespace libcamera {
+
+enum class TestPattern : char {
+ ColorBars = 0,
+ DiagonalLines = 1,
+};
+
+class TestPatternGenerator : public FrameGenerator
+{
+private:
+ void generateFrame(const Size &size,
+ const FrameBuffer *buffer) override;
+
+protected:
+ /* Shift the buffer by 1 pixel left each frame */
+ void shiftLeft(const Size &size);
+ /* Buffer of test pattern template */
+ std::unique_ptr<uint8_t[]> template_;
+};
+
+class ColorBarsGenerator : public TestPatternGenerator
+{
+public:
+ static std::unique_ptr<ColorBarsGenerator> create();
+
+private:
+ /* Generate a template buffer of the color bar test pattern. */
+ void configure(const Size &size) override;
+};
+
+class DiagonalLinesGenerator : public TestPatternGenerator
+{
+public:
+ static std::unique_ptr<DiagonalLinesGenerator> create();
+
+private:
+ /* Generate a template buffer of the diagonal lines test pattern. */
+ void configure(const Size &size) override;
+};
+
+} /* namespace libcamera */
diff --git a/src/libcamera/pipeline/virtual/virtual.cpp b/src/libcamera/pipeline/virtual/virtual.cpp
index 8abb74b4..a36ffd42 100644
--- a/src/libcamera/pipeline/virtual/virtual.cpp
+++ b/src/libcamera/pipeline/virtual/virtual.cpp
@@ -184,10 +184,14 @@ int PipelineHandlerVirtual::exportFrameBuffers(
return dmaBufAllocator_.exportFrameBuffers(stream->configuration(), buffers);
}
-int PipelineHandlerVirtual::start([[maybe_unused]] Camera *camera,
+int PipelineHandlerVirtual::start(Camera *camera,
[[maybe_unused]] const ControlList *controls)
{
/* \todo Start reading the virtual video if any. */
+ VirtualCameraData *data = cameraData(camera);
+
+ data->frameGenerator_->configure(data->stream_.configuration().size);
+
return 0;
}
@@ -199,9 +203,14 @@ void PipelineHandlerVirtual::stopDevice([[maybe_unused]] Camera *camera)
int PipelineHandlerVirtual::queueRequestDevice([[maybe_unused]] Camera *camera,
Request *request)
{
+ VirtualCameraData *data = cameraData(camera);
+
/* \todo Read from the virtual video if any. */
- for (auto it : request->buffers())
- completeBuffer(request, it.second);
+ for (auto const &[stream, buffer] : request->buffers()) {
+ /* map buffer and fill test patterns */
+ data->frameGenerator_->generateFrame(stream->configuration().size, buffer);
+ completeBuffer(request, buffer);
+ }
request->metadata().set(controls::SensorTimestamp, currentTimestamp());
completeRequest(request);
@@ -233,11 +242,24 @@ bool PipelineHandlerVirtual::match([[maybe_unused]] DeviceEnumerator *enumerator
std::set<Stream *> streams{ &data->stream_ };
const std::string id = "Virtual0";
std::shared_ptr<Camera> camera = Camera::create(std::move(data), id, streams);
+
+ initFrameGenerator(camera.get());
+
registerCamera(std::move(camera));
return false; // Prevent infinite loops for now
}
+void PipelineHandlerVirtual::initFrameGenerator(Camera *camera)
+{
+ auto data = cameraData(camera);
+ if (data->testPattern_ == TestPattern::DiagonalLines) {
+ data->frameGenerator_ = DiagonalLinesGenerator::create();
+ } else {
+ data->frameGenerator_ = ColorBarsGenerator::create();
+ }
+}
+
REGISTER_PIPELINE_HANDLER(PipelineHandlerVirtual, "virtual")
} /* namespace libcamera */
diff --git a/src/libcamera/pipeline/virtual/virtual.h b/src/libcamera/pipeline/virtual/virtual.h
index 6fc6b34d..fecd9fa6 100644
--- a/src/libcamera/pipeline/virtual/virtual.h
+++ b/src/libcamera/pipeline/virtual/virtual.h
@@ -13,6 +13,8 @@
#include "libcamera/internal/dma_buf_allocator.h"
#include "libcamera/internal/pipeline_handler.h"
+#include "test_pattern_generator.h"
+
namespace libcamera {
class VirtualCameraData : public Camera::Private
@@ -29,9 +31,13 @@ public:
~VirtualCameraData() = default;
+ TestPattern testPattern_;
+
std::vector<Resolution> supportedResolutions_;
Stream stream_;
+
+ std::unique_ptr<FrameGenerator> frameGenerator_;
};
class VirtualCameraConfiguration : public CameraConfiguration
@@ -72,6 +78,8 @@ private:
return static_cast<VirtualCameraData *>(camera->_d());
}
+ void initFrameGenerator(Camera *camera);
+
DmaBufAllocator dmaBufAllocator_;
};
--
2.46.0.rc1.232.g9752f9e123-goog
More information about the libcamera-devel
mailing list