summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2020-09-04 17:45:39 +0200
committerJacopo Mondi <jacopo@jmondi.org>2020-10-07 16:09:22 +0200
commitde8304b11678c9c70008ee07d9f5c69e5bcf05d3 (patch)
tree9b821f0f15b5914c419c4260fc454c9e0bd3e649 /src/android
parentb84e35dc97059716c7e90f73ce1df2709c5a7f6e (diff)
android: camera_device: Use CameraStream buffers
Now that CameraStream that require internal memory allocation have been instrumented with a FrameBuffer pool, use them to create intermediate buffers in the CameraDevice. Reviewed-by: Umang Jain <email@uajain.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/camera_device.cpp51
1 files changed, 41 insertions, 10 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index ecdc0922..257ffdf2 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1387,24 +1387,48 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
descriptor->buffers[i].stream = camera3Buffers[i].stream;
descriptor->buffers[i].buffer = camera3Buffers[i].buffer;
- /* Software streams are handled after hardware streams complete. */
- if (cameraStream->camera3Stream().format == HAL_PIXEL_FORMAT_BLOB)
- continue;
-
/*
- * Create a libcamera buffer using the dmabuf descriptors of
- * the camera3Buffer for each stream. The FrameBuffer is
- * directly associated with the Camera3RequestDescriptor for
- * lifetime management only.
+ * Inspect the camera stream type, create buffers opportunely
+ * and add them to the Request if required.
*/
- FrameBuffer *buffer = createFrameBuffer(*camera3Buffers[i].buffer);
+ FrameBuffer *buffer = nullptr;
+ switch (cameraStream->type()) {
+ case CameraStream::Type::Mapped:
+ /*
+ * Mapped streams don't need buffers added to the
+ * Request.
+ */
+ continue;
+
+ case CameraStream::Type::Direct:
+ /*
+ * Create a libcamera buffer using the dmabuf
+ * descriptors of the camera3Buffer for each stream and
+ * associate it with the Camera3RequestDescriptor for
+ * lifetime management only.
+ */
+ buffer = createFrameBuffer(*camera3Buffers[i].buffer);
+ descriptor->frameBuffers.emplace_back(buffer);
+ break;
+
+ case CameraStream::Type::Internal:
+ /*
+ * Get the frame buffer from the CameraStream internal
+ * buffer pool.
+ *
+ * The buffer has to be returned to the CameraStream
+ * once it has been processed.
+ */
+ buffer = cameraStream->getBuffer();
+ break;
+ }
+
if (!buffer) {
LOG(HAL, Error) << "Failed to create buffer";
delete request;
delete descriptor;
return -ENOMEM;
}
- descriptor->frameBuffers.emplace_back(buffer);
request->addBuffer(cameraStream->stream(), buffer);
}
@@ -1476,6 +1500,13 @@ void CameraDevice::requestComplete(Request *request)
status = CAMERA3_BUFFER_STATUS_ERROR;
continue;
}
+
+ /*
+ * Return the FrameBuffer to the CameraStream now that we're
+ * done processing it.
+ */
+ if (cameraStream->type() == CameraStream::Type::Internal)
+ cameraStream->putBuffer(buffer);
}
/* Prepare to call back the Android camera stack. */