summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2021-08-06 13:18:01 +0100
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-08-10 10:57:04 +0100
commitfdf1851f0b5f4d31bb61ce63726dcee6d6e647fa (patch)
tree32dc9c2bec21188ed3712a636c1d402eaf3142cb /src/android
parentf3629363c4d25f32c76449740e918445180906db (diff)
libcamera: MappedFrameBuffer: Use typed Flags<MapModes>
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>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/jpeg/encoder_libjpeg.cpp3
-rw-r--r--src/android/jpeg/thumbnailer.cpp2
-rw-r--r--src/android/yuv/post_processor_yuv.cpp2
3 files changed, 3 insertions, 4 deletions
diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp
index 372018d2..a7a63601 100644
--- a/src/android/jpeg/encoder_libjpeg.cpp
+++ b/src/android/jpeg/encoder_libjpeg.cpp
@@ -12,7 +12,6 @@
#include <iostream>
#include <sstream>
#include <string.h>
-#include <sys/mman.h>
#include <unistd.h>
#include <vector>
@@ -182,7 +181,7 @@ void EncoderLibJpeg::compressNV(Span<const uint8_t> frame)
int EncoderLibJpeg::encode(const FrameBuffer &source, Span<uint8_t> dest,
Span<const uint8_t> exifData, unsigned int quality)
{
- MappedFrameBuffer frame(&source, PROT_READ);
+ MappedFrameBuffer frame(&source, MappedFrameBuffer::MapFlag::Read);
if (!frame.isValid()) {
LOG(JPEG, Error) << "Failed to map FrameBuffer : "
<< strerror(frame.error());
diff --git a/src/android/jpeg/thumbnailer.cpp b/src/android/jpeg/thumbnailer.cpp
index 535e2cec..79d83926 100644
--- a/src/android/jpeg/thumbnailer.cpp
+++ b/src/android/jpeg/thumbnailer.cpp
@@ -41,7 +41,7 @@ void Thumbnailer::createThumbnail(const FrameBuffer &source,
const Size &targetSize,
std::vector<unsigned char> *destination)
{
- MappedFrameBuffer frame(&source, PROT_READ);
+ MappedFrameBuffer frame(&source, MappedFrameBuffer::MapFlag::Read);
if (!frame.isValid()) {
LOG(Thumbnailer, Error)
<< "Failed to map FrameBuffer : "
diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp
index 509d4244..3e793a58 100644
--- a/src/android/yuv/post_processor_yuv.cpp
+++ b/src/android/yuv/post_processor_yuv.cpp
@@ -57,7 +57,7 @@ int PostProcessorYuv::process(const FrameBuffer &source,
if (!isValidBuffers(source, *destination))
return -EINVAL;
- const MappedFrameBuffer sourceMapped(&source, PROT_READ);
+ const MappedFrameBuffer sourceMapped(&source, MappedFrameBuffer::MapFlag::Read);
if (!sourceMapped.isValid()) {
LOG(YUV, Error) << "Failed to mmap camera frame buffer";
return -EINVAL;