NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

android: mm: cros: Handle buffer registration failure

Browse source 
cros::CameraBufferManager::Register() fails if a buffer handle
is invalid. We should mark CameraBuffer as invalid on the failure
of Register().

While the cros::CameraBufferManager Unlock() and Deregister() functions
should be able to handle buffers that haven't been locked and
registered, this isn't an API guarantee, and errors will be logged.
Avoid this by skipping unlocking and unregistration of buffers that
haven't been locked or registered.

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Hirokazu Honda 2021-04-04 01:22:47 +09:00 • committed by Laurent Pinchart
parent cbb580d5af
commit 7d78798338
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/android/mm/cros_camera_buffer.cpp
View file

@ -37,6 +37,7 @@ private:
buffer_handle_t handle_;
unsigned int numPlanes_;
bool valid_;
bool registered_;
union {
void *addr;
android_ycbcr ycbcr;
@ -49,16 +50,21 @@ private:
CameraBuffer::Private::Private(CameraBuffer *cameraBuffer,
buffer_handle_t camera3Buffer, int flags)
: Extensible::Private(cameraBuffer), handle_(camera3Buffer),
numPlanes_(0), valid_(false)
numPlanes_(0), valid_(false), registered(false)
{
bufferManager_ = cros::CameraBufferManager::GetInstance();
bufferManager_->Register(camera3Buffer);
int ret = bufferManager_->Register(camera3Buffer);
if (ret) {
LOG(HAL, Error) << "Failed registering a buffer: " << ret;
return;
}
registered_ = true;
numPlanes_ = bufferManager_->GetNumPlanes(camera3Buffer);
switch (numPlanes_) {
case 1: {
int ret = bufferManager_->Lock(handle_, 0, 0, 0, 0, 0, &mem.addr);
ret = bufferManager_->Lock(handle_, 0, 0, 0, 0, 0, &mem.addr);
if (ret) {
LOG(HAL, Error) << "Single plane buffer mapping failed";
return;
@ -67,8 +73,8 @@ CameraBuffer::Private::Private(CameraBuffer *cameraBuffer,
}
case 2:
case 3: {
int ret = bufferManager_->LockYCbCr(handle_, 0, 0, 0, 0, 0,
&mem.ycbcr);
ret = bufferManager_->LockYCbCr(handle_, 0, 0, 0, 0, 0,
&mem.ycbcr);
if (ret) {
LOG(HAL, Error) << "YCbCr buffer mapping failed";
return;
@ -85,8 +91,10 @@ CameraBuffer::Private::Private(CameraBuffer *cameraBuffer,
CameraBuffer::Private::~Private()
{
bufferManager_->Unlock(handle_);
bufferManager_->Deregister(handle_);
if (valid_)
bufferManager_->Unlock(handle_);
if (registered_)
bufferManager_->Deregister(handle_);
}
unsigned int CameraBuffer::Private::numPlanes() const