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

Commit 3b203e70 authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera VTS: Synchronize access to 'mOutstandingBufferIds' 

'mOutstandingBufferIds' is a shared state that can be accessed
and modified by several threads.
Synchronize access to 'mOutstandingBufferIds' within
'processCaptureResultLocked'.

Flag: EXEMPT bugfix
Bug: 382692352
Test: atest VtsAidlHalCameraProvider_TargetTest
Change-Id: I74b41d008348497b1904a64de25fb772bb01b15c
parent decade87

camera/provider/aidl/vts/device_cb.cpp

+10 −3
Original line number Diff line number Diff line
@@ -421,12 +421,19 @@ bool DeviceCb::processCaptureResultLocked( 
    }



    for (const auto& buffer : results.outputBuffers) {

        std::unique_lock<std::mutex> l(mLock);

        CameraAidlTest::InFlightRequest::StreamBufferAndTimestamp streamBufferAndTimestamp;

        auto outstandingBuffers = mUseHalBufManager ? mOutstandingBufferIds :

        auto& outstandingBuffers = mUseHalBufManager ? mOutstandingBufferIds :

            request->mOutstandingBufferIds;

        auto bufferId = mUseHalBufManager ? buffer.bufferId : results.frameNumber;

        auto outputBuffer = outstandingBuffers.empty() ? ::android::makeFromAidl(buffer.buffer) :

            outstandingBuffers[buffer.streamId][bufferId];

        const native_handle_t *outputBuffer = nullptr;

        if (outstandingBuffers.empty()) {

           outputBuffer = ::android::makeFromAidl(buffer.buffer);

        } else if (outstandingBuffers[buffer.streamId].contains(bufferId)) {

            outputBuffer = outstandingBuffers[buffer.streamId][bufferId];

        } else {

            ALOGV("%s: Invalid bufferId: %" PRId64, __FUNCTION__, bufferId);

        }

        streamBufferAndTimestamp.buffer = {buffer.streamId,

                                           bufferId,

                                           outputBuffer,