android: camera_stream: Break out CameraStream

Break CameraStream out of the CameraDevice class.

No functional changes, only the code is moved.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

1 files changed, 1 insertions, 23 deletions

diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index 1837748d..52923ec9 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -23,33 +23,11 @@
 #include "libcamera/internal/log.h"
 #include "libcamera/internal/message.h"
 
+#include "camera_stream.h"
 #include "jpeg/encoder.h"
 
 class CameraMetadata;
 
-class CameraStream
-{
-public:
-	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(); }
-
-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
-	 * one or more streams to the Android framework.
-	 */
-	unsigned int index_;
-	std::unique_ptr<Encoder> encoder_;
-};
-
 class CameraDevice : protected libcamera::Loggable
 {
 public: