[libcamera-devel,v3,4/4] android: camera_stream: Make some member variables constant
diff mbox series

Message ID 20201021013955.301790-4-hiroh@chromium.org
State Accepted
Commit bb27fbf253ecbcba9046bc69b94a2c0152137aad
Headers show
Series
  • [libcamera-devel,v3,1/4] android: Modify PostProcessor interface
Related show

Commit Message

Hirokazu Honda Oct. 21, 2020, 1:39 a.m. UTC 
CameraStream initializes several member variables in the
initializer list. Some of them are unchanged after. This makes
them constant. Especially, doing to |cameraDevice_| represents
CameraStream doesn't have the ownership of it.

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Umang Jain <email@uajain.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/android/camera_stream.cpp |  7 +++----
 src/android/camera_stream.h   | 10 +++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

Patch
diff mbox series 

diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp
index 3e5d6be..dba351a 100644
--- a/src/android/camera_stream.cpp
+++ b/src/android/camera_stream.cpp
@@ -38,13 +38,12 @@  LOG_DECLARE_CATEGORY(HAL)
  * and buffer allocation.
  */
 
-CameraStream::CameraStream(CameraDevice *cameraDevice, Type type,
+CameraStream::CameraStream(CameraDevice *const cameraDevice, Type type,
 			   camera3_stream_t *camera3Stream, unsigned int index)
-	: cameraDevice_(cameraDevice), type_(type),
+	: cameraDevice_(cameraDevice),
+	  config_(cameraDevice->cameraConfiguration()), type_(type),
 	  camera3Stream_(camera3Stream), index_(index)
 {
-	config_ = cameraDevice_->cameraConfiguration();
-
 	if (type_ == Type::Internal || type_ == Type::Mapped) {
 		/*
 		 * \todo There might be multiple post-processors. The logic
diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h
index c367a5f..cc9d547 100644
--- a/src/android/camera_stream.h
+++ b/src/android/camera_stream.h
@@ -109,7 +109,7 @@  public:
 		Internal,
 		Mapped,
 	};
-	CameraStream(CameraDevice *cameraDevice, Type type,
+	CameraStream(CameraDevice *const cameraDevice, Type type,
 		     camera3_stream_t *camera3Stream, unsigned int index);
 
 	Type type() const { return type_; }
@@ -124,11 +124,11 @@  public:
 	void putBuffer(libcamera::FrameBuffer *buffer);
 
 private:
-	CameraDevice *cameraDevice_;
-	libcamera::CameraConfiguration *config_;
-	Type type_;
+	CameraDevice *const cameraDevice_;
+	const libcamera::CameraConfiguration *config_;
+	const Type type_;
 	camera3_stream_t *camera3Stream_;
-	unsigned int index_;
+	const unsigned int index_;
 
 	std::unique_ptr<libcamera::FrameBufferAllocator> allocator_;
 	std::vector<libcamera::FrameBuffer *> buffers_;