From 2b1a908b5222e26317d761a18e91d6ede93b6e16 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 1 May 2019 01:06:34 +0300
Subject: libcamera: camera: Add a validation API to the CameraConfiguration
class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
test/camera/capture.cpp | 7 +------
test/camera/configuration_default.cpp | 4 ++--
test/camera/configuration_set.cpp | 7 +------
3 files changed, 4 insertions(+), 14 deletions(-)
(limited to 'test/camera')
diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp
index bb7d380c..c0835c25 100644
--- a/test/camera/capture.cpp
+++ b/test/camera/capture.cpp
@@ -45,7 +45,7 @@ protected:
CameraTest::init();
config_ = camera_->generateConfiguration({ StreamRole::VideoRecording });
- if (!config_) {
+ if (!config_ || config_->size() != 1) {
cout << "Failed to generate default configuration" << endl;
CameraTest::cleanup();
return TestFail;
@@ -58,11 +58,6 @@ protected:
{
StreamConfiguration &cfg = config_->at(0);
- if (!config_->isValid()) {
- cout << "Failed to read default configuration" << endl;
- return TestFail;
- }
-
if (camera_->acquire()) {
cout << "Failed to acquire the camera" << endl;
return TestFail;
diff --git a/test/camera/configuration_default.cpp b/test/camera/configuration_default.cpp
index 8a767d23..ce2ec5d0 100644
--- a/test/camera/configuration_default.cpp
+++ b/test/camera/configuration_default.cpp
@@ -22,7 +22,7 @@ protected:
/* Test asking for configuration for a video stream. */
config = camera_->generateConfiguration({ StreamRole::VideoRecording });
- if (!config || !config->isValid()) {
+ if (!config || config->size() != 1) {
cout << "Default configuration invalid" << endl;
return TestFail;
}
@@ -32,7 +32,7 @@ protected:
* stream roles returns an empty camera configuration.
*/
config = camera_->generateConfiguration({});
- if (!config || config->isValid()) {
+ if (!config || config->size() != 0) {
cout << "Failed to retrieve configuration for empty roles list"
<< endl;
return TestFail;
diff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp
index ece987c7..9f10f795 100644
--- a/test/camera/configuration_set.cpp
+++ b/test/camera/configuration_set.cpp
@@ -21,7 +21,7 @@ protected:
CameraTest::init();
config_ = camera_->generateConfiguration({ StreamRole::VideoRecording });
- if (!config_) {
+ if (!config_ || config_->size() != 1) {
cout << "Failed to generate default configuration" << endl;
CameraTest::cleanup();
return TestFail;
@@ -34,11 +34,6 @@ protected:
{
StreamConfiguration &cfg = config_->at(0);
- if (!config_->isValid()) {
- cout << "Failed to read default configuration" << endl;
- return TestFail;
- }
-
if (camera_->acquire()) {
cout << "Failed to acquire the camera" << endl;
return TestFail;
--
cgit v1.2.1