libcamera: allocator: Add FrameBufferAllocator to help applications allocate buffers

The FrameBuffer interface is based on the idea that all buffers are
allocated externally to libcamera and are only used by it. This is meant
to create a simpler API centered around usage of buffers, regardless of
where they come from.

Linux however lacks a centralized allocator at the moment, and not all
users of libcamera are expected to use another device that could provide
suitable buffers for the camera. This patch thus adds a helper class to
allocate buffers internally in libcamera, in a way that matches the
needs of the FrameBuffer-based API.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund
2019-10-27 22:10:25 +01:00
parent e9e6135d97
commit eb4030f6c0
6 changed files with 286 additions and 1 deletions

View File

@@ -9,6 +9,7 @@
#include <iomanip>
#include <libcamera/framebuffer_allocator.h>
#include <libcamera/request.h>
#include <libcamera/stream.h>
@@ -405,7 +406,7 @@ const std::string &Camera::name() const
Camera::Camera(PipelineHandler *pipe, const std::string &name)
: pipe_(pipe->shared_from_this()), name_(name), disconnected_(false),
state_(CameraAvailable)
state_(CameraAvailable), allocator_(nullptr)
{
}
@@ -541,6 +542,16 @@ int Camera::release()
if (!stateBetween(CameraAvailable, CameraConfigured))
return -EBUSY;
if (allocator_) {
/*
* \todo Try to find a better API that would make this error
* impossible.
*/
LOG(Camera, Error)
<< "Buffers must be freed before the camera can be reconfigured";
return -EBUSY;
}
pipe_->unlock();
state_ = CameraAvailable;
@@ -649,6 +660,12 @@ int Camera::configure(CameraConfiguration *config)
if (!stateBetween(CameraAcquired, CameraConfigured))
return -EACCES;
if (allocator_ && allocator_->allocated()) {
LOG(Camera, Error)
<< "Allocator must be deleted before camera can be reconfigured";
return -EBUSY;
}
if (config->validate() != CameraConfiguration::Valid) {
LOG(Camera, Error)
<< "Can't configure camera with invalid configuration";