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

Commit a0db308c authored by Mathias Agopian's avatar Mathias Agopian
Browse files

remove SurfaceTexture::connect() 

use BufferQueue::connect() instead

Change-Id: I04aab7cf11304bf962cde38470747f3b19ddba42
parent bce2d744

include/gui/SurfaceTexture.h

+0 −2
Original line number Diff line number Diff line
@@ -185,8 +185,6 @@ public: 
    status_t setConsumerUsageBits(uint32_t usage);

    status_t setTransformHint(uint32_t hint);

    virtual status_t setSynchronousMode(bool enabled);

    virtual status_t connect(int api,

                uint32_t* outWidth, uint32_t* outHeight, uint32_t* outTransform);



    // getBufferQueue returns the BufferQueue object to which this

    // SurfaceTexture is connected.

libs/gui/SurfaceTexture.cpp

+0 −7
Original line number Diff line number Diff line
@@ -743,13 +743,6 @@ sp<BufferQueue> SurfaceTexture::getBufferQueue() const { 
    return mBufferQueue;

}



// Used for refactoring, should not be in final interface

status_t SurfaceTexture::connect(int api,

                uint32_t* outWidth, uint32_t* outHeight, uint32_t* outTransform) {

    Mutex::Autolock lock(mMutex);

    return mBufferQueue->connect(api, outWidth, outHeight, outTransform);

}



void SurfaceTexture::onFrameAvailable() {

    ST_LOGV("onFrameAvailable");

services/surfaceflinger/Layer.cpp

+1 −4
Original line number Diff line number Diff line
@@ -103,9 +103,6 @@ void Layer::onFirstRef() 
    mSurfaceTexture = new SurfaceTexture(mTextureName, true,

            GL_TEXTURE_EXTERNAL_OES, false, bq);







    mSurfaceTexture->setTransformHint(getTransformHint());

    mSurfaceTexture->setConsumerUsageBits(getEffectiveUsage(0));

    mSurfaceTexture->setFrameAvailableListener(new FrameQueuedListener(this));

    mSurfaceTexture->setSynchronousMode(true);