2b1a908b52
The CameraConfiguration class implements a simple storage of StreamConfiguration with internal validation limited to verifying that the stream configurations are not empty. Extend this mechanism by implementing a smart validate() method backed by pipeline handlers. This new mechanism changes the semantic of the camera configuration. The Camera::generateConfiguration() operation still generates a default configuration based on roles, but now also supports generating empty configurations to be filled by applications. Applications can inspect the configuration, optionally modify it, and validate it. The validation implements "try" semantics and adjusts invalid configurations instead of rejecting them completely. Applications then decide whether to accept the modified configuration, or try again with a different set of parameters. Once the configuration is valid, it is passed to Camera::configure(), and pipeline handlers are guaranteed that the configuration they receive is valid. A reference to the Camera may need to be stored in the CameraConfiguration derived classes in order to access it from their validate() implementation. This must be stored as a std::shared_ptr<> as the CameraConfiguration instances belong to applications. In order to make this possible, make the Camera class inherit from std::shared_from_this<>. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
98 lines
2.1 KiB
C++
98 lines
2.1 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (C) 2019, Google Inc.
|
|
*
|
|
* libcamera Camera API tests
|
|
*/
|
|
|
|
#include <iostream>
|
|
|
|
#include "camera_test.h"
|
|
|
|
using namespace std;
|
|
|
|
namespace {
|
|
|
|
class ConfigurationSet : public CameraTest
|
|
{
|
|
protected:
|
|
int init() override
|
|
{
|
|
CameraTest::init();
|
|
|
|
config_ = camera_->generateConfiguration({ StreamRole::VideoRecording });
|
|
if (!config_ || config_->size() != 1) {
|
|
cout << "Failed to generate default configuration" << endl;
|
|
CameraTest::cleanup();
|
|
return TestFail;
|
|
}
|
|
|
|
return TestPass;
|
|
}
|
|
|
|
int run() override
|
|
{
|
|
StreamConfiguration &cfg = config_->at(0);
|
|
|
|
if (camera_->acquire()) {
|
|
cout << "Failed to acquire the camera" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
/* Test that setting the default configuration works. */
|
|
if (camera_->configure(config_.get())) {
|
|
cout << "Failed to set default configuration" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
/*
|
|
* Test that configuring the camera fails if it is not
|
|
* acquired, this will also test release and reacquiring
|
|
* of the camera.
|
|
*/
|
|
if (camera_->release()) {
|
|
cout << "Failed to release the camera" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
if (!camera_->configure(config_.get())) {
|
|
cout << "Setting configuration on a camera not acquired succeeded when it should have failed"
|
|
<< endl;
|
|
return TestFail;
|
|
}
|
|
|
|
if (camera_->acquire()) {
|
|
cout << "Failed to acquire the camera" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
/*
|
|
* Test that modifying the default configuration works. Doubling
|
|
* the default configuration of the VIMC camera is known to
|
|
* work.
|
|
*/
|
|
cfg.size.width *= 2;
|
|
cfg.size.height *= 2;
|
|
if (camera_->configure(config_.get())) {
|
|
cout << "Failed to set modified configuration" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
/*
|
|
* Test that setting an invalid configuration fails.
|
|
*/
|
|
cfg.size = { 0, 0 };
|
|
if (!camera_->configure(config_.get())) {
|
|
cout << "Invalid configuration incorrectly accepted" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
return TestPass;
|
|
}
|
|
|
|
std::unique_ptr<CameraConfiguration> config_;
|
|
};
|
|
|
|
} /* namespace */
|
|
|
|
TEST_REGISTER(ConfigurationSet);
|