From 7bfe7d7056a7485bf4d05055cdec85f4f684cb14 Mon Sep 17 00:00:00 2001 From: Hirokazu Honda Date: Thu, 26 Aug 2021 17:00:19 +0900 Subject: android: generic_camera_buffer: Correct buffer mapping buffer_handle_t doesn't provide sufficient info to map a buffer properly. cros::CameraBufferManager enables handling the buffer on ChromeOS, but no way is provided for other platforms. Therefore, we put the assumption that planes are in the same buffer and they are consecutive. This modifies the way of mapping in generic_camera_buffer with the assumption. Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Signed-off-by: Laurent Pinchart --- src/android/camera_buffer.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/android/camera_buffer.h') diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h index c4e3a9e7..87df2570 100644 --- a/src/android/camera_buffer.h +++ b/src/android/camera_buffer.h @@ -11,13 +11,17 @@ #include #include +#include +#include class CameraBuffer final : public libcamera::Extensible { LIBCAMERA_DECLARE_PRIVATE() public: - CameraBuffer(buffer_handle_t camera3Buffer, int flags); + CameraBuffer(buffer_handle_t camera3Buffer, + libcamera::PixelFormat pixelFormat, + const libcamera::Size &size, int flags); ~CameraBuffer(); bool isValid() const; @@ -31,8 +35,12 @@ public: }; #define PUBLIC_CAMERA_BUFFER_IMPLEMENTATION \ -CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags) \ - : Extensible(std::make_unique(this, camera3Buffer, flags)) \ +CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, \ + libcamera::PixelFormat pixelFormat, \ + const libcamera::Size &size, int flags) \ + : Extensible(std::make_unique(this, camera3Buffer, \ + pixelFormat, size, \ + flags)) \ { \ } \ CameraBuffer::~CameraBuffer() \ -- cgit v1.2.1