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

Commit 56d9580d authored by Avichal Rakesh's avatar Avichal Rakesh Committed by Automerger Merge Worker
Browse files

Merge "ExternalCameraHAL: Fix memory leak when copying buffer fence" into main... 

Merge "ExternalCameraHAL: Fix memory leak when copying buffer fence" into main am: 634ecd5d am: aba897e5 am: a11d57f6

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2817883



Change-Id: I168257bac3466f67fdb90da573402c0775a20f28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 928a88aa a11d57f6

camera/device/default/ExternalCameraDeviceSession.cpp

+8 −12
Original line number Diff line number Diff line
@@ -789,9 +789,8 @@ Status ExternalCameraDeviceSession::switchToOffline( 
                outputBuffer.bufferId = buffer.bufferId;

                outputBuffer.status = BufferStatus::ERROR;

                if (buffer.acquireFence >= 0) {

                    native_handle_t* handle = native_handle_create(/*numFds*/ 1, /*numInts*/ 0);

                    handle->data[0] = buffer.acquireFence;

                    outputBuffer.releaseFence = android::makeToAidl(handle);

                    outputBuffer.releaseFence.fds.resize(1);

                    outputBuffer.releaseFence.fds.at(0).set(buffer.acquireFence);

                }

            } else {

                offlineBuffers.push_back(buffer);
@@ -1769,9 +1768,8 @@ Status ExternalCameraDeviceSession::processCaptureRequestError( 
        result.outputBuffers[i].bufferId = req->buffers[i].bufferId;

        result.outputBuffers[i].status = BufferStatus::ERROR;

        if (req->buffers[i].acquireFence >= 0) {

            native_handle_t* handle = native_handle_create(/*numFds*/ 1, /*numInts*/ 0);

            handle->data[0] = req->buffers[i].acquireFence;

            result.outputBuffers[i].releaseFence = ::android::makeToAidl(handle);

            result.outputBuffers[i].releaseFence.fds.resize(1);

            result.outputBuffers[i].releaseFence.fds.at(0).set(req->buffers[i].acquireFence);

        }

    }
@@ -1815,18 +1813,16 @@ Status ExternalCameraDeviceSession::processCaptureResult(std::shared_ptr<HalRequ 
        if (req->buffers[i].fenceTimeout) {

            result.outputBuffers[i].status = BufferStatus::ERROR;

            if (req->buffers[i].acquireFence >= 0) {

                native_handle_t* handle = native_handle_create(/*numFds*/ 1, /*numInts*/ 0);

                handle->data[0] = req->buffers[i].acquireFence;

                result.outputBuffers[i].releaseFence = ::android::makeToAidl(handle);

                result.outputBuffers[i].releaseFence.fds.resize(1);

                result.outputBuffers[i].releaseFence.fds.at(0).set(req->buffers[i].acquireFence);

            }

            notifyError(req->frameNumber, req->buffers[i].streamId, ErrorCode::ERROR_BUFFER);

        } else {

            result.outputBuffers[i].status = BufferStatus::OK;

            // TODO: refactor

            if (req->buffers[i].acquireFence >= 0) {

                native_handle_t* handle = native_handle_create(/*numFds*/ 1, /*numInts*/ 0);

                handle->data[0] = req->buffers[i].acquireFence;

                result.outputBuffers[i].releaseFence = ::android::makeToAidl(handle);

                result.outputBuffers[i].releaseFence.fds.resize(1);

                result.outputBuffers[i].releaseFence.fds.at(0).set(req->buffers[i].acquireFence);

            }

        }

    }