camera_device: Remove private scope of Camera3RequestDescriptor

Camera3RequestDescriptor is a utility structure that groups information
about a capture request. It can be and will be extended to preserve the
context of a capture overall. Since the context of a capture needs to
be shared among other classes (for e.g. CameraStream) having a private
definition of the struct in CameraDevice class doesn't help.

Hence, de-scope the structure so that it can be shared with other
components (through references or pointers). Splitting the structure to
a separate file will help avoiding circular dependencies when using it
through the HAL implementation.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>

1 files changed, 2 insertions, 25 deletions

diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index b7d774fe..86224aa1 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -33,7 +33,9 @@
 #include "camera_worker.h"
 #include "jpeg/encoder.h"
 
+struct Camera3RequestDescriptor;
 struct CameraConfigData;
+
 class CameraDevice : protected libcamera::Loggable
 {
 public:
@@ -73,31 +75,6 @@ private:
 
 	CameraDevice(unsigned int id, std::shared_ptr<libcamera::Camera> camera);
 
-	struct Camera3RequestDescriptor {
-		enum class Status {
-			Pending,
-			Success,
-			Error,
-		};
-
-		Camera3RequestDescriptor() = default;
-		~Camera3RequestDescriptor() = default;
-		Camera3RequestDescriptor(libcamera::Camera *camera,
-					 const camera3_capture_request_t *camera3Request);
-		Camera3RequestDescriptor &operator=(Camera3RequestDescriptor &&) = default;
-
-		bool isPending() const { return status_ == Status::Pending; }
-
-		uint32_t frameNumber_ = 0;
-		std::vector<camera3_stream_buffer_t> buffers_;
-		std::vector<std::unique_ptr<libcamera::FrameBuffer>> frameBuffers_;
-		CameraMetadata settings_;
-		std::unique_ptr<CaptureRequest> request_;
-
-		camera3_capture_result_t captureResult_ = {};
-		Status status_ = Status::Pending;
-	};
-
 	enum class State {
 		Stopped,
 		Flushing,