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

Commit db2722a3 authored by Dan Stoza's avatar Dan Stoza
Browse files

GLConsumer: Stop using default constructor params 

Removes the dependency on default constructor parameters for
GLConsumer so that a different constructor prototype can safely be
added.

Change-Id: I0da924bbd4c141edbf305598c1be8bc575654680
parent d5d08c57

cmds/screenrecord/FrameOutput.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ status_t FrameOutput::createInputSurface(int width, int height, 
    sp<IGraphicBufferConsumer> consumer;

    sp<IGraphicBufferConsumer> consumer;

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

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

    mGlConsumer = new GLConsumer(consumer, mExtTextureName,

    mGlConsumer = new GLConsumer(consumer, mExtTextureName,

                GL_TEXTURE_EXTERNAL_OES);

                GL_TEXTURE_EXTERNAL_OES, true, false);

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

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

    mGlConsumer->setDefaultBufferSize(width, height);

    mGlConsumer->setDefaultBufferSize(width, height);

    mGlConsumer->setDefaultMaxBufferCount(5);

    mGlConsumer->setDefaultMaxBufferCount(5);

cmds/screenrecord/Overlay.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -173,7 +173,7 @@ status_t Overlay::setup_l() { 
    sp<IGraphicBufferConsumer> consumer;

    sp<IGraphicBufferConsumer> consumer;

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

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

    mGlConsumer = new GLConsumer(consumer, mExtTextureName,

    mGlConsumer = new GLConsumer(consumer, mExtTextureName,

                GL_TEXTURE_EXTERNAL_OES);

                GL_TEXTURE_EXTERNAL_OES, true, false);

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

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

    mGlConsumer->setDefaultBufferSize(width, height);

    mGlConsumer->setDefaultBufferSize(width, height);

    mGlConsumer->setDefaultMaxBufferCount(5);

    mGlConsumer->setDefaultMaxBufferCount(5);

cmds/stagefright/stagefright.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -942,7 +942,9 @@ int main(int argc, char **argv) { 
            sp<IGraphicBufferProducer> producer;

            sp<IGraphicBufferProducer> producer;

            sp<IGraphicBufferConsumer> consumer;

            sp<IGraphicBufferConsumer> consumer;

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

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

            sp<GLConsumer> texture = new GLConsumer(consumer, 0 /* tex */);

            sp<GLConsumer> texture = new GLConsumer(consumer, 0 /* tex */,

                    GLConsumer::TEXTURE_EXTERNAL, true /* useFenceSync */,

                    false /* isControlledByApp */);

            gSurface = new Surface(producer);

            gSurface = new Surface(producer);

        }

        }