summaryrefslogtreecommitdiff
path: root/src/libcamera/pipeline/ipu3/ipu3.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/pipeline/ipu3/ipu3.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/pipeline/ipu3/ipu3.cpp')
-rw-r--r--src/libcamera/pipeline/ipu3/ipu3.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index ca09da75..f96e8763 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -145,8 +145,10 @@ public:
int configureStreams(Camera *camera,
const CameraConfiguration &config) override;
- int allocateBuffers(Camera *camera, Stream *stream) override;
- int freeBuffers(Camera *camera, Stream *stream) override;
+ int allocateBuffers(Camera *camera,
+ const std::set<Stream *> &streams) override;
+ int freeBuffers(Camera *camera,
+ const std::set<Stream *> &streams) override;
int start(Camera *camera) override;
void stop(Camera *camera) override;
@@ -305,9 +307,11 @@ int PipelineHandlerIPU3::configureStreams(Camera *camera,
return 0;
}
-int PipelineHandlerIPU3::allocateBuffers(Camera *camera, Stream *stream)
+int PipelineHandlerIPU3::allocateBuffers(Camera *camera,
+ const std::set<Stream *> &streams)
{
IPU3CameraData *data = cameraData(camera);
+ Stream *stream = *streams.begin();
CIO2Device *cio2 = &data->cio2_;
ImgUDevice *imgu = data->imgu_;
int ret;
@@ -346,7 +350,8 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera, Stream *stream)
return 0;
}
-int PipelineHandlerIPU3::freeBuffers(Camera *camera, Stream *stream)
+int PipelineHandlerIPU3::freeBuffers(Camera *camera,
+ const std::set<Stream *> &streams)
{
IPU3CameraData *data = cameraData(camera);