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

libcamera: camera: Remove the prepared state

Browse Source 
With the FrameBuffer rework completed there is no reason to keep the
camera prepared state around as buffer allocations are now decoupled
from the camera state. Remove the camera state simplifying the 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-11-25 17:51:06 +01:00
parent 6cd505ac89
commit a1c5450be5
10 changed files with 22 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcamera/framebuffer_allocator.cpp
View File

@@ -116,8 +116,7 @@ FrameBufferAllocator::~FrameBufferAllocator()
*/
int FrameBufferAllocator::allocate(Stream *stream)
{
if (camera_->state_ != Camera::CameraConfigured &&
camera_->state_ != Camera::CameraPrepared) {
if (camera_->state_ != Camera::CameraConfigured) {
LOG(Allocator, Error)
<< "Camera must be in the configured state to allocate buffers";
return -EACCES;
@@ -163,7 +162,7 @@ int FrameBufferAllocator::allocate(Stream *stream)
*/
int FrameBufferAllocator::free(Stream *stream)
{
if (camera_->state_ != Camera::CameraConfigured && camera_->state_ != Camera::CameraPrepared) {
if (camera_->state_ != Camera::CameraConfigured) {
LOG(Allocator, Error)
<< "Camera must be in the configured state to free buffers";
return -EACCES;