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

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

Merge "GraphicsTracker: do not provide FrameEventHistoryDelta when... 

Merge "GraphicsTracker: do not provide FrameEventHistoryDelta when dequeuBuffer" into main am: c0e479ea am: 0356a3ae

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



Change-Id: I63eef0a71a750337db4fa966ce1cf1d00e7a3702
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f12dd2a7 0356a3ae

media/codec2/hal/client/GraphicsTracker.cpp

+1 −2
Original line number Diff line number Diff line
@@ -664,11 +664,10 @@ c2_status_t GraphicsTracker::_allocate(const std::shared_ptr<BufferCache> &cache 


    int slotId;

    uint64_t outBufferAge;

    ::android::FrameEventHistoryDelta outTimestamps;

    sp<Fence> fence;



    ::android::status_t status = igbp->dequeueBuffer(

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

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

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

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

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