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

libcamera: base: shared_fd: Rename fd() to get()

Browse Source 
For consistency with UniqueFD, rename the fd() function to get().
Renaming UniqueFD::get() to fd() would have been another option, but was
rejected to keep as close as possible to the std::shared_ptr<> and
std::unique_ptr<> APIs.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
This commit is contained in:
Laurent Pinchart
2021-12-04 23:05:07 +02:00
parent 5c85e70240
commit 560f5cf998
14 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/v4l2_videodevice.cpp
+3 -3
View File
@@ -282,7 +282,7 @@ bool V4L2BufferCache::Entry::operator==(const FrameBuffer &buffer) const
return false;
for (unsigned int i = 0; i < planes.size(); i++)
if (planes_[i].fd != planes[i].fd.fd() ||
if (planes_[i].fd != planes[i].fd.get() ||
planes_[i].length != planes[i].length)
return false;
return true;
@@ -1517,9 +1517,9 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer)
if (buf.memory == V4L2_MEMORY_DMABUF) {
if (multiPlanar) {
for (unsigned int p = 0; p < numV4l2Planes; ++p)
v4l2Planes[p].m.fd = planes[p].fd.fd();
v4l2Planes[p].m.fd = planes[p].fd.get();
} else {
buf.m.fd = planes[0].fd.fd();
buf.m.fd = planes[0].fd.get();
}
}