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

Commit c5474201 authored by Ian Elliott's avatar Ian Elliott Committed by android-build-merger
Browse files

Merge "Have the Surface class track the buffer age." into oc-mr1-dev 

am: 88249364

Change-Id: I1b7d0d46dfc5d325990a56fcdde6e8124f8bc7d8
parents 79bc90e7 88249364

media/libstagefright/omx/1.0/WGraphicBufferProducer.cpp

+3 −4
Original line number Original line Diff line number Diff line
@@ -64,9 +64,8 @@ Return<void> TWGraphicBufferProducer::dequeueBuffer( 
    sp<Fence> fence;

    sp<Fence> fence;

    ::android::FrameEventHistoryDelta outTimestamps;

    ::android::FrameEventHistoryDelta outTimestamps;

    status_t status = mBase->dequeueBuffer(

    status_t status = mBase->dequeueBuffer(

            &slot, &fence,

        &slot, &fence, width, height,

            width, height,

        static_cast<::android::PixelFormat>(format), usage, nullptr,

            static_cast<::android::PixelFormat>(format), usage,

        getFrameTimestamps ? &outTimestamps : nullptr);

        getFrameTimestamps ? &outTimestamps : nullptr);

    hidl_handle tFence;

    hidl_handle tFence;

    FrameEventHistoryDelta tOutTimestamps;

    FrameEventHistoryDelta tOutTimestamps;