PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: camera: Pass the stream set to allocate/freeBuffers()

Browse Source 
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>
This commit is contained in:
Jacopo Mondi
2019-03-26 17:25:15 +01:00
parent 4e1dc9004f
commit 911bc4aa41
6 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/pipeline/uvcvideo.cpp
+9 -4
View File
@@ -32,8 +32,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;
@@ -127,9 +129,11 @@ int PipelineHandlerUVC::configureStreams(Camera *camera,
return 0;
}
int PipelineHandlerUVC::allocateBuffers(Camera *camera, Stream *stream)
int PipelineHandlerUVC::allocateBuffers(Camera *camera,
const std::set<Stream *> &streams)
{
UVCCameraData *data = cameraData(camera);
Stream *stream = *streams.begin();
const StreamConfiguration &cfg = stream->configuration();
LOG(UVC, Debug) << "Requesting " << cfg.bufferCount << " buffers";
@@ -137,7 +141,8 @@ int PipelineHandlerUVC::allocateBuffers(Camera *camera, Stream *stream)
return data->video_->exportBuffers(&stream->bufferPool());
}
int PipelineHandlerUVC::freeBuffers(Camera *camera, Stream *stream)
int PipelineHandlerUVC::freeBuffers(Camera *camera,
const std::set<Stream *> &streams)
{
UVCCameraData *data = cameraData(camera);
return data->video_->releaseBuffers();