summaryrefslogtreecommitdiff
path: root/include/libcamera/camera.h
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-05-01 01:06:34 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-05-23 01:07:38 +0300
commit2b1a908b5222e26317d761a18e91d6ede93b6e16 (patch)
tree4a207808ee0d82481ceb732fcc051fb19b508fed /include/libcamera/camera.h
parentadc61fc3ce911f32128b4d8f37d42272baf42d7b (diff)
libcamera: camera: Add a validation API to the CameraConfiguration class
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>
Diffstat (limited to 'include/libcamera/camera.h')
-rw-r--r--include/libcamera/camera.h17
1 files changed, 12 insertions, 5 deletions
diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h
index a3a7289a..fb2f7ba3 100644
--- a/include/libcamera/camera.h
+++ b/include/libcamera/camera.h
@@ -25,14 +25,19 @@ class Request;
class CameraConfiguration
{
public:
+ enum Status {
+ Valid,
+ Adjusted,
+ Invalid,
+ };
+
using iterator = std::vector<StreamConfiguration>::iterator;
using const_iterator = std::vector<StreamConfiguration>::const_iterator;
- CameraConfiguration();
+ virtual ~CameraConfiguration();
void addConfiguration(const StreamConfiguration &cfg);
-
- bool isValid() const;
+ virtual Status validate() = 0;
StreamConfiguration &at(unsigned int index);
const StreamConfiguration &at(unsigned int index) const;
@@ -53,11 +58,13 @@ public:
bool empty() const;
std::size_t size() const;
-private:
+protected:
+ CameraConfiguration();
+
std::vector<StreamConfiguration> config_;
};
-class Camera final
+class Camera final : public std::enable_shared_from_this<Camera>
{
public:
static std::shared_ptr<Camera> create(PipelineHandler *pipe,