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

libcamera: v4l2_videodevice: Use scope_exit

Browse Source 
The V4L2VideoDevice::queueBuffer() function performs the same cleanup
action in many error paths. Use scope_exit to simplify it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2025-08-05 02:31:51 +03:00
committed by Kieran Bingham
parent 6ef2d79a73
commit 4e567d1981
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libcamera/v4l2_videodevice.cpp
View File

@@ -1668,6 +1668,8 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer)
if (ret < 0)
return ret;
auto guard = utils::scope_exit{ [&]() { cache_->put(buf.index); } };
buf.index = ret;
buf.type = bufferType_;
buf.memory = memoryType_;
@@ -1683,15 +1685,11 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer)
*/
if (planes.size() < numV4l2Planes) {
LOG(V4L2, Error) << "Frame buffer has too few planes";
cache_->put(buf.index);
return -EINVAL;
}
if (planes.size() != numV4l2Planes && !buffer->_d()->isContiguous()) {
LOG(V4L2, Error) << "Device format requires contiguous buffer";
cache_->put(buf.index);
return -EINVAL;
}
@@ -1734,8 +1732,6 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer)
if (i != planes.size() - 1 && bytesused != length) {
LOG(V4L2, Error)
<< "Holes in multi-planar buffer not supported";
cache_->put(buf.index);
return -EINVAL;
}
}
@@ -1785,8 +1781,6 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer)
LOG(V4L2, Error)
<< "Failed to queue buffer " << buf.index << ": "
<< strerror(-ret);
cache_->put(buf.index);
return ret;
}
@@ -1798,6 +1792,7 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer)
queuedBuffers_[buf.index] = buffer;
guard.release();
return 0;
}