From db2722a319d91a869ebc4dd618edbef43fd5b738 Mon Sep 17 00:00:00 2001 From: Dan Stoza Date: Tue, 24 Jun 2014 13:04:08 -0700 Subject: 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 --- cmds/screenrecord/FrameOutput.cpp | 2 +- cmds/screenrecord/Overlay.cpp | 2 +- cmds/stagefright/stagefright.cpp | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'cmds') diff --git a/cmds/screenrecord/FrameOutput.cpp b/cmds/screenrecord/FrameOutput.cpp index 4da16bc..03e0062 100644 --- a/cmds/screenrecord/FrameOutput.cpp +++ b/cmds/screenrecord/FrameOutput.cpp @@ -71,7 +71,7 @@ status_t FrameOutput::createInputSurface(int width, int height, sp consumer; BufferQueue::createBufferQueue(&producer, &consumer); mGlConsumer = new GLConsumer(consumer, mExtTextureName, - GL_TEXTURE_EXTERNAL_OES); + GL_TEXTURE_EXTERNAL_OES, true, false); mGlConsumer->setName(String8("virtual display")); mGlConsumer->setDefaultBufferSize(width, height); mGlConsumer->setDefaultMaxBufferCount(5); diff --git a/cmds/screenrecord/Overlay.cpp b/cmds/screenrecord/Overlay.cpp index af84069..7fef53d 100644 --- a/cmds/screenrecord/Overlay.cpp +++ b/cmds/screenrecord/Overlay.cpp @@ -173,7 +173,7 @@ status_t Overlay::setup_l() { sp consumer; BufferQueue::createBufferQueue(&mProducer, &consumer); mGlConsumer = new GLConsumer(consumer, mExtTextureName, - GL_TEXTURE_EXTERNAL_OES); + GL_TEXTURE_EXTERNAL_OES, true, false); mGlConsumer->setName(String8("virtual display")); mGlConsumer->setDefaultBufferSize(width, height); mGlConsumer->setDefaultMaxBufferCount(5); diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp index b70afe6..81edcb4 100644 --- a/cmds/stagefright/stagefright.cpp +++ b/cmds/stagefright/stagefright.cpp @@ -942,7 +942,9 @@ int main(int argc, char **argv) { sp producer; sp consumer; BufferQueue::createBufferQueue(&producer, &consumer); - sp texture = new GLConsumer(consumer, 0 /* tex */); + sp texture = new GLConsumer(consumer, 0 /* tex */, + GLConsumer::TEXTURE_EXTERNAL, true /* useFenceSync */, + false /* isControlledByApp */); gSurface = new Surface(producer); } -- cgit v1.1