qcam: Use Image class to access pixel data

Replace the manual implementation of frame buffer mapping with the Image
class to improve code sharing. The ViewFinder API is updated to take an
Image pointer in the render() function to prepare for multi-planar
buffer support.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h
index 28244bca..a16bea09 100644
--- a/src/qcam/main_window.h
+++ b/src/qcam/main_window.h
@@ -34,6 +34,7 @@ using namespace libcamera;
 class QAction;
 class QComboBox;
 
+class Image;
 class HotplugEvent;
 
 enum {
@@ -106,8 +107,7 @@ private:
 	FrameBufferAllocator *allocator_;
 
 	std::unique_ptr<CameraConfiguration> config_;
-	std::map<FrameBuffer *, Span<uint8_t>> mappedBuffers_;
-	std::map<FrameBuffer *, Span<uint8_t>> planeData_;
+	std::map<FrameBuffer *, std::unique_ptr<Image>> mappedBuffers_;
 
 	/* Capture state, buffers queue and statistics */
 	bool isCapturing_;