Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-15 08:25:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

android: camera_device: Create the Request and Camera3RequestDescriptor together

Browse source 
Move the construction of the Request higher in the code flow so that
multiple buffers and streams can be added where required.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Kieran Bingham 2020-07-01 13:28:16 +01:00
parent 74ab442dcf
commit eac0542c5e
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/android/camera_device.cpp
View file

@ -1066,6 +1066,10 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
Camera3RequestDescriptor *descriptor = Camera3RequestDescriptor *descriptor =
new Camera3RequestDescriptor(camera3Request->frame_number, new Camera3RequestDescriptor(camera3Request->frame_number,
camera3Request->num_output_buffers); camera3Request->num_output_buffers);
Request *request =
camera_->createRequest(reinterpret_cast<uint64_t>(descriptor));
for (unsigned int i = 0; i < descriptor->numBuffers; ++i) { for (unsigned int i = 0; i < descriptor->numBuffers; ++i) {
/* /*
* Keep track of which stream the request belongs to and store * Keep track of which stream the request belongs to and store
@ -1085,12 +1089,11 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
FrameBuffer *buffer = createFrameBuffer(*camera3Buffers[0].buffer); FrameBuffer *buffer = createFrameBuffer(*camera3Buffers[0].buffer);
if (!buffer) { if (!buffer) {
LOG(HAL, Error) << "Failed to create buffer"; LOG(HAL, Error) << "Failed to create buffer";
delete request;
delete descriptor; delete descriptor;
return -ENOMEM; return -ENOMEM;
} }
Request *request =
camera_->createRequest(reinterpret_cast<uint64_t>(descriptor));
request->addBuffer(stream, buffer); request->addBuffer(stream, buffer);
int ret = camera_->queueRequest(request); int ret = camera_->queueRequest(request);