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

Commit 38d215bb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "GraphicsTracker: handle dequeueBuffer error while switching Surfaces"... 

Merge "GraphicsTracker: handle dequeueBuffer error while switching Surfaces" into main am: 677708a2

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



Change-Id: Id0c987efd73cea053d9cd9e6a3bfec070d404802
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf4d2931 677708a2

media/codec2/hal/client/GraphicsTracker.cpp

+9 −0
Original line number Original line Diff line number Diff line
@@ -673,6 +673,15 @@ c2_status_t GraphicsTracker::_allocate(const std::shared_ptr<BufferCache> &cache 
            ALOGW("BQ might not be ready for dequeueBuffer()");

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

            return C2_BLOCKING;

            return C2_BLOCKING;

        }

        }

        bool cacheExpired = false;

        {

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

            cacheExpired = (mBufferCache.get() != cache.get());

        }

        if (cacheExpired) {

            ALOGW("a new BQ is configured. dequeueBuffer() error %d", (int)status);

            return C2_BLOCKING;

        }

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

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

        return C2_CORRUPTED;

        return C2_CORRUPTED;

    }

    }