From 75df3c71397ffdd61568b19157d327284c6d3a7f Mon Sep 17 00:00:00 2001 From: Hirokazu Honda Date: Tue, 31 Aug 2021 06:02:24 +0900 Subject: libcamera: mapped_framebuffer: Rename maps() to planes() MappedFrameBuffer::maps() returns planes_. This renames the function name to planes(). Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Signed-off-by: Laurent Pinchart --- src/android/jpeg/encoder_libjpeg.cpp | 2 +- src/android/jpeg/thumbnailer.cpp | 2 +- src/android/yuv/post_processor_yuv.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/android') diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp index a7a63601..b8b01e20 100644 --- a/src/android/jpeg/encoder_libjpeg.cpp +++ b/src/android/jpeg/encoder_libjpeg.cpp @@ -188,7 +188,7 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span dest, return frame.error(); } - return encode(frame.maps()[0], dest, exifData, quality); + return encode(frame.planes()[0], dest, exifData, quality); } int EncoderLibJpeg::encode(Span src, Span dest, diff --git a/src/android/jpeg/thumbnailer.cpp b/src/android/jpeg/thumbnailer.cpp index 79d83926..043c7b33 100644 --- a/src/android/jpeg/thumbnailer.cpp +++ b/src/android/jpeg/thumbnailer.cpp @@ -62,7 +62,7 @@ void Thumbnailer::createThumbnail(const FrameBuffer &source, ASSERT(tw % 2 == 0 && th % 2 == 0); /* Image scaling block implementing nearest-neighbour algorithm. */ - unsigned char *src = static_cast(frame.maps()[0].data()); + unsigned char *src = static_cast(frame.planes()[0].data()); unsigned char *srcC = src + sh * sw; unsigned char *srcCb, *srcCr; unsigned char *dstY, *srcY; diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp index 3e793a58..6952fc38 100644 --- a/src/android/yuv/post_processor_yuv.cpp +++ b/src/android/yuv/post_processor_yuv.cpp @@ -63,9 +63,9 @@ int PostProcessorYuv::process(const FrameBuffer &source, return -EINVAL; } - int ret = libyuv::NV12Scale(sourceMapped.maps()[0].data(), + int ret = libyuv::NV12Scale(sourceMapped.planes()[0].data(), sourceStride_[0], - sourceMapped.maps()[1].data(), + sourceMapped.planes()[1].data(), sourceStride_[1], sourceSize_.width, sourceSize_.height, destination->plane(0).data(), -- cgit v1.2.1