diff options
author | Shuzhen Wang <shuzhenwang@google.com> | 2020-05-21 22:17:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-21 22:17:53 +0000 |
commit | f4cbf93d3cfee6e83f499b677c28bbf1b12d31ba (patch) | |
tree | 36ffe6a959960f8999247768e40a2fe1813cae32 | |
parent | e95719b54b3256203909ea2339be2372fe8b651c (diff) | |
parent | ea65a0830bdea7b1b9e34ead074b993cfd1600ca (diff) | |
download | camera-f4cbf93d3cfee6e83f499b677c28bbf1b12d31ba.tar.gz |
QCamera2: HAL3: Fix ERROR_REQUEST/ERROR_BUFFER bugs am: 6777bc3ddc am: a19eb7e545 am: 28d813dc10 am: ea65a0830b
Change-Id: I39cb1e739c544d2347d1d0a91b2c04dc15eee06e
-rw-r--r-- | msm8998/QCamera2/HAL3/QCamera3HWI.cpp | 53 |
1 files changed, 43 insertions, 10 deletions
diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp index fad216a..2b14f84 100644 --- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp +++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp @@ -4592,6 +4592,15 @@ void QCamera3HardwareInterface::handleBufferWithLock( LOGH("result frame_number = %d, buffer = %p", frame_number, buffer->buffer); + if (buffer->status == CAMERA3_BUFFER_STATUS_ERROR) { + camera3_notify_msg_t notify_msg = {}; + notify_msg.type = CAMERA3_MSG_ERROR; + notify_msg.message.error.frame_number = frame_number; + notify_msg.message.error.error_code = CAMERA3_MSG_ERROR_BUFFER ; + notify_msg.message.error.error_stream = buffer->stream; + orchestrateNotify(¬ify_msg); + } + mPendingBuffersMap.removeBuf(buffer->buffer); mOutputBufferDispatcher.markBufferReady(frame_number, *buffer); @@ -15216,8 +15225,11 @@ int32_t QCamera3HardwareInterface::notifyErrorForPendingRequests() pendingBuffer = mPendingBuffersMap.mPendingBuffersInRequest.erase(pendingBuffer); } else if (pendingBuffer == mPendingBuffersMap.mPendingBuffersInRequest.end() || ((pendingRequest != mPendingRequestsList.end()) && - (pendingBuffer->frame_number > pendingRequest->frame_number))) { - // If the buffers for this frame were sent already, notify about a result error. + (pendingBuffer->frame_number > pendingRequest->frame_number || + (pendingBuffer->frame_number == pendingRequest->frame_number && + pendingBuffer->mPendingBufferList.size() < pendingRequest->num_buffers)))) { + // If some or all buffers for this frame were sent already, notify about a result error, + // as well as remaining buffer errors. camera3_notify_msg_t notify_msg; memset(¬ify_msg, 0, sizeof(camera3_notify_msg_t)); notify_msg.type = CAMERA3_MSG_ERROR; @@ -15234,20 +15246,41 @@ int32_t QCamera3HardwareInterface::notifyErrorForPendingRequests() orchestrateResult(&result); } + if (pendingBuffer != mPendingBuffersMap.mPendingBuffersInRequest.end() && + pendingBuffer->frame_number == pendingRequest->frame_number) { + for (const auto &info : pendingBuffer->mPendingBufferList) { + // Send a buffer error for this frame number. + camera3_notify_msg_t notify_msg; + memset(¬ify_msg, 0, sizeof(camera3_notify_msg_t)); + notify_msg.type = CAMERA3_MSG_ERROR; + notify_msg.message.error.error_code = CAMERA3_MSG_ERROR_BUFFER; + notify_msg.message.error.error_stream = info.stream; + notify_msg.message.error.frame_number = pendingBuffer->frame_number; + orchestrateNotify(¬ify_msg); + + camera3_stream_buffer_t buffer = {}; + buffer.acquire_fence = -1; + buffer.release_fence = -1; + buffer.buffer = info.buffer; + buffer.status = CAMERA3_BUFFER_STATUS_ERROR; + buffer.stream = info.stream; + mOutputBufferDispatcher.markBufferReady(pendingBuffer->frame_number, buffer); + } + pendingBuffer = mPendingBuffersMap.mPendingBuffersInRequest.erase(pendingBuffer); + } mShutterDispatcher.clear(pendingRequest->frame_number); pendingRequest = mPendingRequestsList.erase(pendingRequest); } else { // If both buffers and result metadata weren't sent yet, notify about a request error // and return buffers with error. - for (auto &info : pendingBuffer->mPendingBufferList) { - camera3_notify_msg_t notify_msg; - memset(¬ify_msg, 0, sizeof(camera3_notify_msg_t)); - notify_msg.type = CAMERA3_MSG_ERROR; - notify_msg.message.error.error_code = CAMERA3_MSG_ERROR_REQUEST; - notify_msg.message.error.error_stream = info.stream; - notify_msg.message.error.frame_number = pendingBuffer->frame_number; - orchestrateNotify(¬ify_msg); + camera3_notify_msg_t notify_msg; + memset(¬ify_msg, 0, sizeof(camera3_notify_msg_t)); + notify_msg.type = CAMERA3_MSG_ERROR; + notify_msg.message.error.error_code = CAMERA3_MSG_ERROR_REQUEST; + notify_msg.message.error.frame_number = pendingBuffer->frame_number; + orchestrateNotify(¬ify_msg); + for (auto &info : pendingBuffer->mPendingBufferList) { camera3_stream_buffer_t buffer = {}; buffer.acquire_fence = -1; buffer.release_fence = -1; |