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

Commit a7395b40 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by The Android Automerger
Browse files

GLConsumer: Add query for current frame number. 

Surface the underlying frame number of the current texture.

Bug: 10830400
Change-Id: Ide3a7da12ea0aac54588beb6bf00dbfe2cd37653
parent 7fa91dc3

include/gui/GLConsumer.h

+11 −0
Original line number Diff line number Diff line
@@ -141,6 +141,13 @@ public: 
    // documented by the source.

    int64_t getTimestamp();



    // getFrameNumber retrieves the frame number associated with the texture

    // image set by the most recent call to updateTexImage.

    //

    // The frame number is an incrementing counter set to 0 at the creation of

    // the BufferQueue associated with this consumer.

    int64_t getFrameNumber();



    // setDefaultBufferSize is used to set the size of buffers returned by

    // requestBuffers when a with and height of zero is requested.

    // A call to setDefaultBufferSize() may trigger requestBuffers() to
@@ -337,6 +344,10 @@ private: 
    // gets set each time updateTexImage is called.

    int64_t mCurrentTimestamp;



    // mCurrentFrameNumber is the frame counter for the current texture.

    // It gets set each time updateTexImage is called.

    int64_t mCurrentFrameNumber;



    uint32_t mDefaultWidth, mDefaultHeight;



    // mFilteringEnabled indicates whether the transform matrix is computed for

libs/gui/GLConsumer.cpp

+8 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ GLConsumer::GLConsumer(const sp<IGraphicBufferConsumer>& bq, uint32_t tex, 
    mCurrentScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE),

    mCurrentFence(Fence::NO_FENCE),

    mCurrentTimestamp(0),

    mCurrentFrameNumber(0),

    mDefaultWidth(1),

    mDefaultHeight(1),

    mFilteringEnabled(true),
@@ -380,6 +381,7 @@ status_t GLConsumer::updateAndReleaseLocked(const BufferQueue::BufferItem& item) 
    mCurrentScalingMode = item.mScalingMode;

    mCurrentTimestamp = item.mTimestamp;

    mCurrentFence = item.mFence;

    mCurrentFrameNumber = item.mFrameNumber;



    computeCurrentTransformMatrixLocked();
@@ -819,6 +821,12 @@ nsecs_t GLConsumer::getTimestamp() { 
    return mCurrentTimestamp;

}



nsecs_t GLConsumer::getFrameNumber() {

    ST_LOGV("getFrameNumber");

    Mutex::Autolock lock(mMutex);

    return mCurrentFrameNumber;

}



EGLImageKHR GLConsumer::createImage(EGLDisplay dpy,

        const sp<GraphicBuffer>& graphicBuffer) {

    EGLClientBuffer cbuf = (EGLClientBuffer)graphicBuffer->getNativeBuffer();