summaryrefslogtreecommitdiff
path: root/src/libcamera/camera.cpp
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2019-03-26 17:25:15 +0100
committerJacopo Mondi <jacopo@jmondi.org>2019-04-17 15:42:24 +0200
commit911bc4aa41c16eeeaf78ddb4c0a4958bdd19fb96 (patch)
treee33d864d746122c0001e5375f34227942951c27b /src/libcamera/camera.cpp
parent4e1dc9004fca89223d54cf22bae09eff7c0c2d4b (diff)
libcamera: camera: Pass the stream set to allocate/freeBuffers()
Pipeline handlers might need to perform allocation of internal buffers, setup operations, or simple sanity check before going into the per-stream buffer allocation. As of now, PipelineHandler::allocateBuffers() is called once for each active stream, leaving no space for stream-independent configuration. Change this by providing to the pipeline handlers the full set of active streams, and ask them to loop over them to perform per-streams memory allocations and freeing. Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/libcamera/camera.cpp')
-rw-r--r--src/libcamera/camera.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp
index bdf14b31..21caa24b 100644
--- a/src/libcamera/camera.cpp
+++ b/src/libcamera/camera.cpp
@@ -647,13 +647,11 @@ int Camera::allocateBuffers()
return -EINVAL;
}
- for (Stream *stream : activeStreams_) {
- int ret = pipe_->allocateBuffers(this, stream);
- if (ret) {
- LOG(Camera, Error) << "Failed to allocate buffers";
- freeBuffers();
- return ret;
- }
+ int ret = pipe_->allocateBuffers(this, activeStreams_);
+ if (ret) {
+ LOG(Camera, Error) << "Failed to allocate buffers";
+ freeBuffers();
+ return ret;
}
state_ = CameraPrepared;
@@ -683,12 +681,11 @@ int Camera::freeBuffers()
* by the V4L2 device that has allocated them.
*/
stream->bufferPool().destroyBuffers();
- pipe_->freeBuffers(this, stream);
}
state_ = CameraConfigured;
- return 0;
+ return pipe_->freeBuffers(this, activeStreams_);
}
/**