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

Commit ebf562f4 authored by Dan Stoza's avatar Dan Stoza Committed by Android (Google) Code Review
Browse files

Merge "Remove deprecated BufferQueue constructor"

parents 47b496da b278f5e7

cmds/screenrecord/FrameOutput.cpp

+5 −3
Original line number Original line Diff line number Diff line
@@ -67,8 +67,10 @@ status_t FrameOutput::createInputSurface(int width, int height, 
        return UNKNOWN_ERROR;

        return UNKNOWN_ERROR;

    }

    }





    mBufferQueue = new BufferQueue(/*new GraphicBufferAlloc()*/);

    sp<IGraphicBufferProducer> producer;

    mGlConsumer = new GLConsumer(mBufferQueue, mExtTextureName,

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    mGlConsumer = new GLConsumer(consumer, mExtTextureName,

                GL_TEXTURE_EXTERNAL_OES);

                GL_TEXTURE_EXTERNAL_OES);

    mGlConsumer->setName(String8("virtual display"));

    mGlConsumer->setName(String8("virtual display"));

    mGlConsumer->setDefaultBufferSize(width, height);

    mGlConsumer->setDefaultBufferSize(width, height);
@@ -79,7 +81,7 @@ status_t FrameOutput::createInputSurface(int width, int height, 




    mPixelBuf = new uint8_t[width * height * kGlBytesPerPixel];

    mPixelBuf = new uint8_t[width * height * kGlBytesPerPixel];





    *pBufferProducer = mBufferQueue;

    *pBufferProducer = producer;





    ALOGD("FrameOutput::createInputSurface OK");

    ALOGD("FrameOutput::createInputSurface OK");

    return NO_ERROR;

    return NO_ERROR;

cmds/screenrecord/FrameOutput.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -77,10 +77,6 @@ private: 
    // Set by the FrameAvailableListener callback.

    // Set by the FrameAvailableListener callback.

    bool mFrameAvailable;

    bool mFrameAvailable;





    // Our queue.  The producer side is passed to the virtual display, the

    // consumer side feeds into our GLConsumer.

    sp<BufferQueue> mBufferQueue;



    // This receives frames from the virtual display and makes them available

    // This receives frames from the virtual display and makes them available

    // as an external texture.

    // as an external texture.

    sp<GLConsumer> mGlConsumer;

    sp<GLConsumer> mGlConsumer;

cmds/screenrecord/Overlay.cpp

+5 −4
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ status_t Overlay::start(const sp<IGraphicBufferProducer>& outputSurface, 
    assert(mState == RUNNING);

    assert(mState == RUNNING);





    ALOGV("Overlay::start successful");

    ALOGV("Overlay::start successful");

    *pBufferProducer = mBufferQueue;

    *pBufferProducer = mProducer;

    return NO_ERROR;

    return NO_ERROR;

}

}
@@ -169,8 +169,9 @@ status_t Overlay::setup_l() { 
        return UNKNOWN_ERROR;

        return UNKNOWN_ERROR;

    }

    }





    mBufferQueue = new BufferQueue(/*new GraphicBufferAlloc()*/);

    sp<IGraphicBufferConsumer> consumer;

    mGlConsumer = new GLConsumer(mBufferQueue, mExtTextureName,

    BufferQueue::createBufferQueue(&mProducer, &consumer);

    mGlConsumer = new GLConsumer(consumer, mExtTextureName,

                GL_TEXTURE_EXTERNAL_OES);

                GL_TEXTURE_EXTERNAL_OES);

    mGlConsumer->setName(String8("virtual display"));

    mGlConsumer->setName(String8("virtual display"));

    mGlConsumer->setDefaultBufferSize(width, height);

    mGlConsumer->setDefaultBufferSize(width, height);
@@ -187,7 +188,7 @@ void Overlay::release_l() { 
    ALOGV("Overlay::release_l");

    ALOGV("Overlay::release_l");

    mOutputSurface.clear();

    mOutputSurface.clear();

    mGlConsumer.clear();

    mGlConsumer.clear();

    mBufferQueue.clear();

    mProducer.clear();





    mTexProgram.release();

    mTexProgram.release();

    mExtTexProgram.release();

    mExtTexProgram.release();

cmds/screenrecord/Overlay.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -122,9 +122,9 @@ private: 
    // surface.

    // surface.

    sp<IGraphicBufferProducer> mOutputSurface;

    sp<IGraphicBufferProducer> mOutputSurface;





    // Our queue.  The producer side is passed to the virtual display, the

    // Producer side of queue, passed into the virtual display.

    // consumer side feeds into our GLConsumer.

    // The consumer end feeds into our GLConsumer.

    sp<BufferQueue> mBufferQueue;

    sp<IGraphicBufferProducer> mProducer;





    // This receives frames from the virtual display and makes them available

    // This receives frames from the virtual display and makes them available

    // as an external texture.

    // as an external texture.