diff options
| author | Dan Stoza <stoza@google.com> | 2014-06-25 17:03:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-25 03:38:12 +0000 |
| commit | 1ee7a03fafe9b1983465979729a630e5be3be4e1 (patch) | |
| tree | a4653124e3d0567ed33add606be35ed8ba73e7bb | |
| parent | 1760291cf87005f18605a32a35aed9cae09988f7 (diff) | |
| parent | db2722a319d91a869ebc4dd618edbef43fd5b738 (diff) | |
| download | frameworks_av-1ee7a03fafe9b1983465979729a630e5be3be4e1.zip frameworks_av-1ee7a03fafe9b1983465979729a630e5be3be4e1.tar.gz frameworks_av-1ee7a03fafe9b1983465979729a630e5be3be4e1.tar.bz2 | |
Merge "GLConsumer: Stop using default constructor params"
| -rw-r--r-- | cmds/screenrecord/FrameOutput.cpp | 2 | ||||
| -rw-r--r-- | cmds/screenrecord/Overlay.cpp | 2 | ||||
| -rw-r--r-- | cmds/stagefright/stagefright.cpp | 4 |
3 files changed, 5 insertions, 3 deletions
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<IGraphicBufferConsumer> 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<IGraphicBufferConsumer> 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<IGraphicBufferProducer> producer; sp<IGraphicBufferConsumer> 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); } |