From 109a98e8c07b57a4676bf62dbba59cba670163c8 Mon Sep 17 00:00:00 2001 From: Umang Jain Date: Tue, 19 Oct 2021 17:17:51 +0530 Subject: 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 Signed-off-by: Laurent Pinchart Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Hirokazu Honda --- src/android/camera_device.cpp | 43 +++++-------------------------------------- 1 file changed, 5 insertions(+), 38 deletions(-) (limited to 'src/android/camera_device.cpp') diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index fe29b7bc..3689940d 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -6,9 +6,6 @@ */ #include "camera_device.h" -#include "camera_hal_config.h" -#include "camera_ops.h" -#include "post_processor.h" #include #include @@ -27,6 +24,11 @@ #include "system/graphics.h" +#include "camera_hal_config.h" +#include "camera_ops.h" +#include "camera_request.h" +#include "post_processor.h" + using namespace libcamera; LOG_DECLARE_CATEGORY(HAL) @@ -213,41 +215,6 @@ bool validateCropRotate(const camera3_stream_configuration_t &streamList) } /* namespace */ -/* - * \struct Camera3RequestDescriptor - * - * A utility structure that groups information about a capture request to be - * later re-used at request complete time to notify the framework. - */ - -CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor( - Camera *camera, const camera3_capture_request_t *camera3Request) -{ - frameNumber_ = camera3Request->frame_number; - - /* Copy the camera3 request stream information for later access. */ - const uint32_t numBuffers = camera3Request->num_output_buffers; - buffers_.resize(numBuffers); - for (uint32_t i = 0; i < numBuffers; i++) - buffers_[i] = camera3Request->output_buffers[i]; - - /* - * FrameBuffer instances created by wrapping a camera3 provided dmabuf - * are emplaced in this vector of unique_ptr<> for lifetime management. - */ - frameBuffers_.reserve(numBuffers); - - /* Clone the controls associated with the camera3 request. */ - settings_ = CameraMetadata(camera3Request->settings); - - /* - * Create the CaptureRequest, stored as a unique_ptr<> to tie its - * lifetime to the descriptor. - */ - request_ = std::make_unique(camera, - reinterpret_cast(this)); -} - /* * \class CameraDevice * -- cgit v1.2.1