From 45fe8e99c83889816df320c6d27f7a2019744693 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Wed, 2 Sep 2020 12:17:09 +0200 Subject: android: camera_device: Make CameraStream a class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Complete the transformation of CameraStream into a class and provide a read-only interface that allows to access its parameters but not modify them at run-time. No functional changes intended but this change aims to make the code more robust by enforcing a stricter interface in the CameraStream class. Reviewed-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Hirokazu Honda Reviewed-by: Kieran Bingham Signed-off-by: Jacopo Mondi --- src/android/camera_device.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/android/camera_device.h') diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 49a2e7f3..1837748d 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -27,18 +27,20 @@ class CameraMetadata; -struct CameraStream { +class CameraStream +{ public: - CameraStream(libcamera::PixelFormat, libcamera::Size, unsigned int i, - Encoder *e = nullptr); + CameraStream(libcamera::PixelFormat format, libcamera::Size size, + unsigned int index, Encoder *encoder = nullptr); + const libcamera::PixelFormat &format() const { return format_; } + const libcamera::Size &size() const { return size_; } unsigned int index() const { return index_; } Encoder *encoder() const { return encoder_.get(); } - libcamera::PixelFormat format; - libcamera::Size size; - private: + libcamera::PixelFormat format_; + libcamera::Size size_; /* * The index of the libcamera StreamConfiguration as added during * configureStreams(). A single libcamera Stream may be used to deliver -- cgit v1.2.1