summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2014-03-17 18:45:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-17 18:45:45 +0000
commit09076f72639fc80e50eb369d81127527e8757037 (patch)
treebbed93e81a28ce0ba957f91991667311163ee782 /media
parent77bed997bb900ecb40cdc489cff0d5b0f07986dc (diff)
parent526f21b2c68bc7a386b6f3bebe2df4ca86170a0b (diff)
downloadframeworks_base-09076f72639fc80e50eb369d81127527e8757037.zip
frameworks_base-09076f72639fc80e50eb369d81127527e8757037.tar.gz
frameworks_base-09076f72639fc80e50eb369d81127527e8757037.tar.bz2
Merge "Remove deprecated BufferQueue constructor"
Diffstat (limited to 'media')
-rw-r--r--media/mca/filterfw/native/core/gl_env.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/media/mca/filterfw/native/core/gl_env.cpp b/media/mca/filterfw/native/core/gl_env.cpp
index 84dad8c..f092af8 100644
--- a/media/mca/filterfw/native/core/gl_env.cpp
+++ b/media/mca/filterfw/native/core/gl_env.cpp
@@ -162,9 +162,11 @@ bool GLEnv::InitWithNewContext() {
}
// Create dummy surface using a GLConsumer
- sp<BufferQueue> bq = new BufferQueue();
- surfaceTexture_ = new GLConsumer(bq, 0);
- window_ = new Surface(static_cast<sp<IGraphicBufferProducer> >(bq));
+ sp<IGraphicBufferProducer> producer;
+ sp<IGraphicBufferConsumer> consumer;
+ BufferQueue::createBufferQueue(&producer, &consumer);
+ surfaceTexture_ = new GLConsumer(consumer, 0);
+ window_ = new Surface(producer);
surfaces_[0] = SurfaceWindowPair(eglCreateWindowSurface(display(), config, window_.get(), NULL), NULL);
if (CheckEGLError("eglCreateWindowSurface")) return false;