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

android: camera_device: Use abortRequest() instead of open-coding it

Browse source 
Call abortRequest() in CameraDevice::requestComplete() instead of
open-coding it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2021-10-19 17:17:58 +05:30 • committed by Umang Jain
parent a769684815
commit b393edb181
1 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/android/camera_device.cpp
View file

@ -802,6 +802,11 @@ void CameraDevice::abortRequest(Camera3RequestDescriptor *descriptor) const
notifyError(descriptor->frameNumber_, nullptr, CAMERA3_MSG_ERROR_REQUEST); notifyError(descriptor->frameNumber_, nullptr, CAMERA3_MSG_ERROR_REQUEST);
for (auto &buffer : descriptor->buffers_) { for (auto &buffer : descriptor->buffers_) {
/*
* Signal to the framework it has to handle fences that have not
* been waited on by setting the release fence to the acquire
* fence value.
*/
buffer.buffer.release_fence = buffer.buffer.acquire_fence; buffer.buffer.release_fence = buffer.buffer.acquire_fence;
buffer.buffer.acquire_fence = -1; buffer.buffer.acquire_fence = -1;
buffer.buffer.status = CAMERA3_BUFFER_STATUS_ERROR; buffer.buffer.status = CAMERA3_BUFFER_STATUS_ERROR;
@ -1083,21 +1088,7 @@ void CameraDevice::requestComplete(Request *request)
<< " not successfully completed: " << " not successfully completed: "
<< request->status(); << request->status();
notifyError(descriptor->frameNumber_, nullptr, abortRequest(descriptor);
CAMERA3_MSG_ERROR_REQUEST);
for (auto &buffer : descriptor->buffers_) {
/*
* Signal to the framework it has to handle fences that
* have not been waited on by setting the release fence
* to the acquire fence value.
*/
buffer.buffer.release_fence = buffer.buffer.acquire_fence;
buffer.buffer.acquire_fence = -1;
buffer.buffer.status = CAMERA3_BUFFER_STATUS_ERROR;
}
descriptor->status_ = Camera3RequestDescriptor::Status::Error;
sendCaptureResults(); sendCaptureResults();
return; return;