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

Commit 8ef2ca70 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "GraphicsTraker: handle temporary errors in BQ" into main am: aa6cd7d3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3037760



Change-Id: Ibb0cd0ed9be7a70b99e7fb92099dd405fcefc8cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27d8daa1 aa6cd7d3

media/codec2/hal/client/GraphicsTracker.cpp

+7 −1
Original line number Diff line number Diff line
@@ -563,6 +563,8 @@ void GraphicsTracker::commitAllocate(c2_status_t res, const std::shared_ptr<Buff 
        auto mapRet = mDequeued.emplace(bid, *pBuffer);

        CHECK(mapRet.second);

    } else {

        ALOGD("allocate error(%d): Dequeued(%zu), Dequeuable(%d)",

              (int)res, mDequeued.size(), mDequeueable + 1);

        if (adjustDequeueConfLocked(updateDequeue)) {

            return;

        }
@@ -629,7 +631,11 @@ c2_status_t GraphicsTracker::_allocate(const std::shared_ptr<BufferCache> &cache 
    ::android::status_t status = igbp->dequeueBuffer(

            &slotId, &fence, width, height, format, usage, &outBufferAge, &outTimestamps);

    if (status < ::android::OK) {

        ALOGE("dequeueBuffer() error %d", (int)status);

        if (status == ::android::TIMED_OUT || status == ::android::WOULD_BLOCK) {

            ALOGW("BQ might not be ready for dequeueBuffer()");

            return C2_BLOCKING;

        }

        ALOGE("BQ in inconsistent status. dequeueBuffer() error %d", (int)status);

        return C2_CORRUPTED;

    }

    cache->waitOnSlot(slotId);