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, 46 insertions, 0 deletions

diff --git a/src/android/camera_request.h b/src/android/camera_request.h
new file mode 100644
index 00000000..1346f6fa
--- /dev/null
+++ b/src/android/camera_request.h
@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2019-2021, Google Inc.
+ *
+ * camera_request.h - libcamera Android Camera Request Descriptor
+ */
+#ifndef __ANDROID_CAMERA_REQUEST_H__
+#define __ANDROID_CAMERA_REQUEST_H__
+
+#include <memory>
+#include <vector>
+
+#include <libcamera/camera.h>
+#include <libcamera/framebuffer.h>
+
+#include <hardware/camera3.h>
+
+#include "camera_metadata.h"
+#include "camera_worker.h"
+
+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;
+};
+
+#endif /* __ANDROID_CAMERA_REQUEST_H__ */