[libcamera-devel] [PATCH v4 1/7] camera_device: Remove private scope of Camera3RequestDescriptor
Umang Jain
umang.jain at ideasonboard.com
Mon Oct 11 09:34:59 CEST 2021
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 doesn't help. Hence, de-scope the structure
so that it can be shared with other components (through references or
pointers).
Signed-off-by: Umang Jain <umang.jain at ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Reviewed-by: Hirokazu Honda <hiroh at chromium.org>
---
src/android/camera_device.cpp | 2 +-
src/android/camera_device.h | 51 ++++++++++++++++++-----------------
2 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index ef4fbab8..48a96d0c 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -220,7 +220,7 @@ bool validateCropRotate(const camera3_stream_configuration_t &streamList)
* later re-used at request complete time to notify the framework.
*/
-CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(
+Camera3RequestDescriptor::Camera3RequestDescriptor(
Camera *camera, const camera3_capture_request_t *camera3Request)
{
frameNumber_ = camera3Request->frame_number;
diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index b7d774fe..26d1c6de 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -34,6 +34,32 @@
#include "jpeg/encoder.h"
struct CameraConfigData;
+
+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;
+};
+
class CameraDevice : protected libcamera::Loggable
{
public:
@@ -73,31 +99,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,
--
2.31.1
More information about the libcamera-devel
mailing list