[libcamera-devel] [PATCH v4 4/8] android: camera_device: Simplify FrameBuffer construction from a buffer_handle_t
Kieran Bingham
kieran.bingham at ideasonboard.com
Mon Jul 6 17:38:04 CEST 2020
Move the code which constructs a FrameBuffer from the Android buffer handle
to it's own function to simplify the code flow and readability.
Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo at jmondi.org>
---
src/android/camera_device.cpp | 35 +++++++++++++++++++----------------
src/android/camera_device.h | 1 +
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 03dcdd520794..73cfab532cf5 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1011,6 +1011,24 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
return 0;
}
+FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer)
+{
+ std::vector<FrameBuffer::Plane> planes;
+ for (unsigned int i = 0; i < 3; i++) {
+ FrameBuffer::Plane plane;
+ plane.fd = FileDescriptor(camera3buffer->data[i]);
+ /*
+ * Setting length to zero here is OK as the length is only used
+ * to map the memory of the plane. Libcamera do not need to poke
+ * at the memory content queued by the HAL.
+ */
+ plane.length = 0;
+ planes.push_back(std::move(plane));
+ }
+
+ return new FrameBuffer(std::move(planes));
+}
+
int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)
{
StreamConfiguration *streamConfiguration = &config_->at(0);
@@ -1064,22 +1082,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
* Create a libcamera buffer using the dmabuf descriptors of the first
* and (currently) only supported request buffer.
*/
- const buffer_handle_t camera3Handle = *camera3Buffers[0].buffer;
-
- std::vector<FrameBuffer::Plane> planes;
- for (int i = 0; i < 3; i++) {
- FrameBuffer::Plane plane;
- plane.fd = FileDescriptor(camera3Handle->data[i]);
- /*
- * Setting length to zero here is OK as the length is only used
- * to map the memory of the plane. Libcamera do not need to poke
- * at the memory content queued by the HAL.
- */
- plane.length = 0;
- planes.push_back(std::move(plane));
- }
-
- FrameBuffer *buffer = new FrameBuffer(std::move(planes));
+ FrameBuffer *buffer = createFrameBuffer(*camera3Buffers[0].buffer);
if (!buffer) {
LOG(HAL, Error) << "Failed to create buffer";
delete descriptor;
diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index 5bd6cf416156..d7834d94f439 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -70,6 +70,7 @@ private:
int initializeStreamConfigurations();
std::tuple<uint32_t, uint32_t> calculateStaticMetadataSize();
+ libcamera::FrameBuffer *createFrameBuffer(const buffer_handle_t camera3buffer);
void notifyShutter(uint32_t frameNumber, uint64_t timestamp);
void notifyError(uint32_t frameNumber, camera3_stream_t *stream);
libcamera::PixelFormat toPixelFormat(int format);
--
2.25.1
More information about the libcamera-devel
mailing list