From 274607478c712e085633f4d24dba1165154fa5a8 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 19 Oct 2021 17:18:01 +0530 Subject: [PATCH] android: camera_stream: Define explicit move constructor and destructors There's no need for the move constructor and the destructor to be inline. Define them explicitly, with default implementations. This allows usage of the CameraStream class without a complete definition of the PostProcessor class. Signed-off-by: Laurent Pinchart Reviewed-by: Umang Jain Reviewed-by: Jacopo Mondi Signed-off-by: Umang Jain --- src/android/camera_stream.cpp | 4 ++++ src/android/camera_stream.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp index 8e6ccb837..f44a2717a 100644 --- a/src/android/camera_stream.cpp +++ b/src/android/camera_stream.cpp @@ -56,6 +56,10 @@ CameraStream::CameraStream(CameraDevice *const cameraDevice, { } +CameraStream::CameraStream(CameraStream &&other) = default; + +CameraStream::~CameraStream() = default; + const StreamConfiguration &CameraStream::configuration() const { return config_->at(index_); diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h index 85064268c..f242336e7 100644 --- a/src/android/camera_stream.h +++ b/src/android/camera_stream.h @@ -112,6 +112,8 @@ public: CameraStream(CameraDevice *const cameraDevice, libcamera::CameraConfiguration *config, Type type, camera3_stream_t *camera3Stream, unsigned int index); + CameraStream(CameraStream &&other); + ~CameraStream(); Type type() const { return type_; } camera3_stream_t *camera3Stream() const { return camera3Stream_; }