PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apps: lc-compliance: Commit camera configuration last

Browse Source 
Save the result of `Camera::generateConfiguration()` in a local variable,
and only commit it to the member variable `config_` if it passes all checks.
This removes the need for explicit `config_.reset()` calls in error paths,
hence making things simpler.

Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com>
This commit is contained in:
Barnabás Pőcze
2025-06-03 11:11:40 +02:00
parent 7c847b1159
commit 4c4a333c88
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/lc-compliance/helpers/capture.cpp
+11 -15
View File
@@ -27,38 +27,34 @@ void Capture::configure(libcamera::Span<const libcamera::StreamRole> roles)
{
assert(!roles.empty());
config_ = camera_->generateConfiguration(roles);
if (!config_)
auto config = camera_->generateConfiguration(roles);
if (!config)
GTEST_SKIP() << "Roles not supported by camera";
ASSERT_EQ(config_->size(), roles.size()) << "Unexpected number of streams in configuration";
ASSERT_EQ(config->size(), roles.size()) << "Unexpected number of streams in configuration";
/*
* Set the buffers count to the largest value across all streams.
* \todo: Should all streams from a Camera have the same buffer count ?
*/
auto largest =
std::max_element(config_->begin(), config_->end(),
std::max_element(config->begin(), config->end(),
[](const StreamConfiguration &l, const StreamConfiguration &r)
{ return l.bufferCount < r.bufferCount; });
assert(largest != config_->end());
assert(largest != config->end());
for (auto &cfg : *config_)
for (auto &cfg : *config)
cfg.bufferCount = largest->bufferCount;
if (config_->validate() != CameraConfiguration::Valid) {
config_.reset();
FAIL() << "Configuration not valid";
}
ASSERT_EQ(config->validate(), CameraConfiguration::Valid);
for (const auto &cfg : *config_)
for (const auto &cfg : *config)
EXPECT_TRUE(cfg.colorSpace) << "Colorspace not set for " << cfg;
if (camera_->configure(config_.get())) {
config_.reset();
FAIL() << "Failed to configure camera";
}
ASSERT_EQ(camera_->configure(config.get()), 0);
config_ = std::move(config);
}
void Capture::run(unsigned int captureLimit, std::optional<unsigned int> queueLimit)