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

libcamera: MappedFrameBuffer: Use typed Flags<MapModes>

Browse Source 
Remove the need for callers to reference PROT_READ/PROT_WRITE directly
from <sys/mman.h> by instead exposing the Read/Write mapping options as
flags from the MappedFrameBuffer class itself.

While here, introduce the <stdint.h> header which is required for the
uint8_t as part of the Plane.

Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Kieran Bingham
2021-08-06 13:18:01 +01:00
parent f3629363c4
commit fdf1851f0b
8 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/libcamera/mapped_framebuffer.cpp
View File

@@ -140,21 +140,45 @@ MappedBuffer::~MappedBuffer()
* \brief Map a FrameBuffer using the MappedBuffer interface
*/
/**
* \enum MappedFrameBuffer::MapFlag
* \brief Specify the mapping mode for the FrameBuffer
* \var MappedFrameBuffer::Read
* \brief Create a read-only mapping
* \var MappedFrameBuffer::Write
* \brief Create a write-only mapping
* \var MappedFrameBuffer::ReadWrite
* \brief Create a mapping that can be both read and written
*/
/**
* \typedef MappedFrameBuffer::MapFlags
* \brief A bitwise combination of MappedFrameBuffer::MapFlag values
*/
/**
* \brief Map all planes of a FrameBuffer
* \param[in] buffer FrameBuffer to be mapped
* \param[in] flags Protection flags to apply to map
*
* Construct an object to map a frame buffer for CPU access.
* The flags are passed directly to mmap and should be either PROT_READ,
* PROT_WRITE, or a bitwise-or combination of both.
* Construct an object to map a frame buffer for CPU access. The mapping can be
* made as Read only, Write only or support Read and Write operations by setting
* the MapFlag flags accordingly.
*/
MappedFrameBuffer::MappedFrameBuffer(const FrameBuffer *buffer, int flags)
MappedFrameBuffer::MappedFrameBuffer(const FrameBuffer *buffer, MapFlags flags)
{
maps_.reserve(buffer->planes().size());
int mmapFlags = 0;
if (flags & MapFlag::Read)
mmapFlags |= PROT_READ;
if (flags & MapFlag::Write)
mmapFlags |= PROT_WRITE;
for (const FrameBuffer::Plane &plane : buffer->planes()) {
void *address = mmap(nullptr, plane.length, flags,
void *address = mmap(nullptr, plane.length, mmapFlags,
MAP_SHARED, plane.fd.fd(), 0);
if (address == MAP_FAILED) {
error_ = -errno;