summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-04-29 20:58:34 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-05-23 01:07:21 +0300
commit75de3bff9e165e512be5f53e19f31c7388dc08b1 (patch)
treebc91c3263a613fc492820af4d753147e971df65d /include
parent77ae64eb24bf6c2fe241b6f7b841315b1ee15707 (diff)
libcamera: camera: Return a pointer from generateConfiguration()
To prepare for specialising the CameraConfiguration class in pipeline handlers, return a pointer to a camera configuration instead of a reference from Camera::generateConfiguration(). The camera configuration always needs to be allocated from the pipeline handler, and its ownership is passed to the application. For symmetry, change Camera::configure() to take a CameraConfiguration pointer instead of a reference. This aligns with our coding practice of passing parameters that are modified by the callee by pointer. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/camera.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h
index 284e5276..a3a7289a 100644
--- a/include/libcamera/camera.h
+++ b/include/libcamera/camera.h
@@ -77,8 +77,8 @@ public:
int release();
const std::set<Stream *> &streams() const;
- CameraConfiguration generateConfiguration(const StreamRoles &roles);
- int configure(CameraConfiguration &config);
+ std::unique_ptr<CameraConfiguration> generateConfiguration(const StreamRoles &roles);
+ int configure(CameraConfiguration *config);
int allocateBuffers();
int freeBuffers();