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

libcamera: framebuffer_allocator: Lift camera restrictions on allocator

Browse Source 
The Camera class currently requires the allocator to have no allocated
buffer before the camera is reconfigured, and the allocator to be
destroyed before the camera is released. There's no basis for these
restrictions anymore, remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart
2020-03-15 01:27:43 +02:00
parent 33fedea818
commit 4ff18e9506
10 changed files with 8 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libcamera/framebuffer_allocator.cpp
View File

@@ -53,29 +53,6 @@ LOG_DEFINE_CATEGORY(Allocator)
* are provided externally applications shall not use this class.
*/
/**
* \brief Create a FrameBuffer allocator
* \param[in] camera The camera the allocator serves
*
* A single allocator may be created for a Camera instance.
*
* The caller is responsible for deleting the allocator before the camera is
* released.
*
* \return A pointer to the newly created allocator object or nullptr on error
*/
FrameBufferAllocator *
FrameBufferAllocator::create(std::shared_ptr<Camera> camera)
{
if (camera->allocator_) {
LOG(Allocator, Error) << "Camera already has an allocator";
return nullptr;
}
camera->allocator_ = new FrameBufferAllocator(camera);
return camera->allocator_;
}
/**
* \brief Construct a FrameBufferAllocator serving a camera
* \param[in] camera The camera
@@ -88,8 +65,6 @@ FrameBufferAllocator::FrameBufferAllocator(std::shared_ptr<Camera> camera)
FrameBufferAllocator::~FrameBufferAllocator()
{
buffers_.clear();
camera_->allocator_ = nullptr;
}
/**