Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b23d0f15 authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

Merge "Camera: Close acquire fences on failed buffers" into oc-dev am: 9ec59fc5

am: fae3f105

Change-Id: I21d755e05d32b86ec475a45be1ba11ea63ee90f9
parents 1f59d7c1 fae3f105
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -4080,6 +4080,13 @@ void Camera3Device::RequestThread::cleanUpFailedRequests(bool sendRequestError)
        }

        for (size_t i = 0; i < halRequest->num_output_buffers; i++) {
            //Buffers that failed processing could still have
            //valid acquire fence.
            int acquireFence = (*outputBuffers)[i].acquire_fence;
            if (0 <= acquireFence) {
                close(acquireFence);
                outputBuffers->editItemAt(i).acquire_fence = -1;
            }
            outputBuffers->editItemAt(i).status = CAMERA3_BUFFER_STATUS_ERROR;
            captureRequest->mOutputStreams.editItemAt(i)->returnBuffer((*outputBuffers)[i], 0);
        }