libcamera/vivid.git - libcamera pipeline handler for VIVID

Age	Commit message (Collapse)	Author
2021-11-24	test: Convert to pragma once	Kieran Bingham
	Remove the verbose #ifndef/#define/#endif pattern for maintaining header idempotency, and replace it with a simple #pragma once. This simplifies the headers, and prevents redundant changes when header files get moved. Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
2021-10-15	test: Remove using namespace in header files	Hirokazu Honda
	"using namespace" in a header file propagates the namespace to the files including the header file. So it should be avoided. This removes "using namespace" in header files in test. Signed-off-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
2020-09-21	test: Include specific headers instead of libcamera.h	Laurent Pinchart
	Let's only pull required headers, to avoid slowing compilation down. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
2020-05-16	libcamera: Move internal headers to include/libcamera/internal/	Laurent Pinchart
	The libcamera internal headers are located in src/libcamera/include/. The directory is added to the compiler headers search path with a meson include_directories() directive, and internal headers are included with (e.g. for the internal semaphore.h header) #include "semaphore.h" All was well, until libcxx decided to implement the C++20 synchronization library. The __threading_support header gained a #include <semaphore.h> to include the pthread's semaphore support. As include_directories() adds src/libcamera/include/ to the compiler search path with -I, the internal semaphore.h is included instead of the pthread version. Needless to say, the compiler isn't happy. Three options have been considered to fix this issue: - Use -iquote instead of -I. The -iquote option instructs gcc to only consider the header search path for headers included with the "" version. Meson unfortunately doesn't support this option. - Rename the internal semaphore.h header. This was deemed to be the beginning of a long whack-a-mole game, where namespace clashes with system libraries would appear over time (possibly dependent on particular system configurations) and would need to be constantly fixed. - Move the internal headers to another directory to create a unique namespace through path components. This causes lots of churn in all the existing source files through the all project. The first option would be best, but isn't available to us due to missing support in meson. Even if -iquote support was added, we would need to fix the problem before a new version of meson containing the required support would be released. The third option is thus the only practical solution available. Bite the bullet, and do it, moving headers to include/libcamera/internal/. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Jacopo Mondi <jacopo@jmondi.org>
2020-03-18	test: libtest: buffer_source: Close video device right after allocation	Laurent Pinchart
	There's no need to keep the video device open after allocating buffers, as V4L2 supports buffer orphaning and the exported buffers will still be usable. Close the device right after allocation to avoid the need for delayed cleanups. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
2020-03-06	test: Extract BufferSource class out of camera tests to libtest	Niklas Söderlund
	The BufferSource class can be used by other tests other then the camera buffer importer test, move it to libtest. The only changes to BufferSource is for it to be allowed to be split in a header and source file. This change makes it necessary for libtest to have access to internal libcamera headers. As the internal headers already are accessible to all test cases this does not increase the exposure of libcamera internals to the test cases. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020, Google Inc. * * delayed_controls.cpp - libcamera delayed controls test */ #include <iostream> #include "libcamera/internal/delayed_controls.h" #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/v4l2_videodevice.h" #include "test.h" using namespace std; using namespace libcamera; class DelayedControlsTest : public Test { public: DelayedControlsTest() { } protected: int init() override { enumerator_ = DeviceEnumerator::create(); if (!enumerator_) { cerr << "Failed to create device enumerator" << endl; return TestFail; } if (enumerator_->enumerate()) { cerr << "Failed to enumerate media devices" << endl; return TestFail; } DeviceMatch dm("vivid"); dm.add("vivid-000-vid-cap"); media_ = enumerator_->search(dm); if (!media_) { cerr << "vivid video device found" << endl; return TestSkip; } dev_ = V4L2VideoDevice::fromEntityName(media_.get(), "vivid-000-vid-cap"); if (dev_->open()) { cerr << "Failed to open video device" << endl; return TestFail; } const ControlInfoMap &infoMap = dev_->controls(); /* Make sure the controls we require are present. */ if (infoMap.empty()) { cerr << "Failed to enumerate controls" << endl; return TestFail; } if (infoMap.find(V4L2_CID_BRIGHTNESS) == infoMap.end() || infoMap.find(V4L2_CID_CONTRAST) == infoMap.end()) { cerr << "Missing controls" << endl; return TestFail; } return TestPass; } int singleControlNoDelay() { std::unordered_map<uint32_t, DelayedControls::ControlParams> delays = { { V4L2_CID_BRIGHTNESS, { 0, false } }, }; std::unique_ptr<DelayedControls> delayed = std::make_unique<DelayedControls>(dev_.get(), delays); ControlList ctrls; /* Reset control to value not used in test. */ ctrls.set(V4L2_CID_BRIGHTNESS, 1); dev_->setControls(&ctrls); delayed->reset(); /* Trigger the first frame start event */ delayed->applyControls(0); /* Test control without delay are set at once. */ for (unsigned int i = 1; i < 100; i++) { int32_t value = 100 + i; ctrls.set(V4L2_CID_BRIGHTNESS, value); delayed->push(ctrls); delayed->applyControls(i); ControlList result = delayed->get(i); int32_t brightness = result.get(V4L2_CID_BRIGHTNESS).get<int32_t>(); if (brightness != value) { cerr << "Failed single control without delay" << " frame " << i << " expected " << value << " got " << brightness << endl; return TestFail; } } return TestPass; } int singleControlWithDelay() { std::unordered_map<uint32_t, DelayedControls::ControlParams> delays = { { V4L2_CID_BRIGHTNESS, { 1, false } }, }; std::unique_ptr<DelayedControls> delayed = std::make_unique<DelayedControls>(dev_.get(), delays); ControlList ctrls; /* Reset control to value that will be first in test. */ int32_t expected = 4; ctrls.set(V4L2_CID_BRIGHTNESS, expected); dev_->setControls(&ctrls); delayed->reset(); /* Trigger the first frame start event */ delayed->applyControls(0); /* Test single control with delay. */ for (unsigned int i = 1; i < 100; i++) { int32_t value = 10 + i; ctrls.set(V4L2_CID_BRIGHTNESS, value); delayed->push(ctrls); delayed->applyControls(i); ControlList result = delayed->get(i); int32_t brightness = result.get(V4L2_CID_BRIGHTNESS).get<int32_t>(); if (brightness != expected) { cerr << "Failed single control with delay" << " frame " << i << " expected " << expected << " got " << brightness << endl; return TestFail; } expected = value; } return TestPass; } int dualControlsWithDelay(uint32_t startOffset) { static const unsigned int maxDelay = 2; std::unordered_map<uint32_t, DelayedControls::ControlParams> delays = { { V4L2_CID_BRIGHTNESS, { 1, false } }, { V4L2_CID_CONTRAST, { maxDelay, false } }, }; std::unique_ptr<DelayedControls> delayed = std::make_unique<DelayedControls>(dev_.get(), delays); ControlList ctrls; /* Reset control to value that will be first two frames in test. */ int32_t expected = 200; ctrls.set(V4L2_CID_BRIGHTNESS, expected); ctrls.set(V4L2_CID_CONTRAST, expected + 1); dev_->setControls(&ctrls); delayed->reset(); /* Trigger the first frame start event */ delayed->applyControls(startOffset); /* Test dual control with delay. */ for (unsigned int i = 1; i < 100; i++) { uint32_t frame = startOffset + i; int32_t value = 10 + i; ctrls.set(V4L2_CID_BRIGHTNESS, value); ctrls.set(V4L2_CID_CONTRAST, value + 1); delayed->push(ctrls); delayed->applyControls(frame); ControlList result = delayed->get(frame); int32_t brightness = result.get(V4L2_CID_BRIGHTNESS).get<int32_t>(); int32_t contrast = result.get(V4L2_CID_CONTRAST).get<int32_t>(); if (brightness != expected || contrast != expected + 1) { cerr << "Failed dual controls" << " frame " << frame << " brightness " << brightness << " contrast " << contrast << " expected " << expected << endl; return TestFail; } expected = i < maxDelay ? expected : value - 1; } return TestPass; } int dualControlsMultiQueue() { static const unsigned int maxDelay = 2; std::unordered_map<uint32_t, DelayedControls::ControlParams> delays = { { V4L2_CID_BRIGHTNESS, { 1, false } }, { V4L2_CID_CONTRAST, { maxDelay, false } } }; std::unique_ptr<DelayedControls> delayed = std::make_unique<DelayedControls>(dev_.get(), delays); ControlList ctrls; /* Reset control to value that will be first two frames in test. */ int32_t expected = 100; ctrls.set(V4L2_CID_BRIGHTNESS, expected); ctrls.set(V4L2_CID_CONTRAST, expected); dev_->setControls(&ctrls); delayed->reset(); /* Trigger the first frame start event */ delayed->applyControls(0); /* * Queue all controls before any fake frame start. Note we * can't queue up more then the delayed controls history size * which is 16. Where one spot is used by the reset control. */ for (unsigned int i = 0; i < 15; i++) { int32_t value = 10 + i; ctrls.set(V4L2_CID_BRIGHTNESS, value); ctrls.set(V4L2_CID_CONTRAST, value); delayed->push(ctrls); } /* Process all queued controls. */ for (unsigned int i = 1; i < 16; i++) { int32_t value = 10 + i - 1; delayed->applyControls(i); ControlList result = delayed->get(i); int32_t brightness = result.get(V4L2_CID_BRIGHTNESS).get<int32_t>(); int32_t contrast = result.get(V4L2_CID_CONTRAST).get<int32_t>(); if (brightness != expected || contrast != expected) { cerr << "Failed multi queue" << " frame " << i << " brightness " << brightness << " contrast " << contrast << " expected " << expected << endl; return TestFail; } expected = i < maxDelay ? expected : value - 1; } return TestPass; } int run() override { int ret; /* Test single control without delay. */ ret = singleControlNoDelay(); if (ret) return ret; /* Test single control with delay. */ ret = singleControlWithDelay(); if (ret) return ret; /* Test dual controls with different delays. */ ret = dualControlsWithDelay(0); if (ret) return ret; /* Test dual controls with non-zero sequence start. */ ret = dualControlsWithDelay(10000); if (ret) return ret; /* Test dual controls with sequence number wraparound. */ ret = dualControlsWithDelay(UINT32_MAX - 50); if (ret) return ret; /* Test control values produced faster than consumed. */ ret = dualControlsMultiQueue(); if (ret) return ret; return TestPass; } private: std::unique_ptr<DeviceEnumerator> enumerator_; std::shared_ptr<MediaDevice> media_; std::unique_ptr<V4L2VideoDevice> dev_; }; TEST_REGISTER(DelayedControlsTest)