diff options
| author | Mathias Agopian <mathias@google.com> | 2013-07-20 01:02:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-20 01:02:38 +0000 |
| commit | cd63212dedc29d72d4746a4070d018fdbca316a9 (patch) | |
| tree | 04c6fb38509d19a635bbc666dad9afe339bc6166 /media/libstagefright/omx | |
| parent | 83e5c374ec29859e64347820b38013ecc3aaf935 (diff) | |
| parent | 5e1f08b3917ac7900f8a11118afb7e8bf3e61c64 (diff) | |
| download | frameworks_av-cd63212dedc29d72d4746a4070d018fdbca316a9.zip frameworks_av-cd63212dedc29d72d4746a4070d018fdbca316a9.tar.gz frameworks_av-cd63212dedc29d72d4746a4070d018fdbca316a9.tar.bz2 | |
Merge "update to new Consumer APIs"
Diffstat (limited to 'media/libstagefright/omx')
| -rw-r--r-- | media/libstagefright/omx/GraphicBufferSource.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/media/libstagefright/omx/GraphicBufferSource.cpp b/media/libstagefright/omx/GraphicBufferSource.cpp index 6f3ed0d..bbd71be 100644 --- a/media/libstagefright/omx/GraphicBufferSource.cpp +++ b/media/libstagefright/omx/GraphicBufferSource.cpp @@ -18,12 +18,12 @@ //#define LOG_NDEBUG 0 #include <utils/Log.h> -#include <GraphicBufferSource.h> +#include "GraphicBufferSource.h" #include <OMX_Core.h> #include <media/stagefright/foundation/ADebug.h> -#include <MetadataBufferType.h> +#include <media/hardware/MetadataBufferType.h> #include <ui/GraphicBuffer.h> namespace android { @@ -52,10 +52,9 @@ GraphicBufferSource::GraphicBufferSource(OMXNodeInstance* nodeInstance, String8 name("GraphicBufferSource"); - mBufferQueue = new BufferQueue(true); + mBufferQueue = new BufferQueue(); mBufferQueue->setConsumerName(name); mBufferQueue->setDefaultBufferSize(bufferWidth, bufferHeight); - mBufferQueue->setSynchronousMode(true); mBufferQueue->setConsumerUsageBits(GRALLOC_USAGE_HW_VIDEO_ENCODER | GRALLOC_USAGE_HW_TEXTURE); @@ -76,7 +75,7 @@ GraphicBufferSource::GraphicBufferSource(OMXNodeInstance* nodeInstance, sp<BufferQueue::ConsumerListener> proxy; proxy = new BufferQueue::ProxyConsumerListener(listener); - mInitCheck = mBufferQueue->consumerConnect(proxy); + mInitCheck = mBufferQueue->consumerConnect(proxy, false); if (mInitCheck != NO_ERROR) { ALOGE("Error connecting to BufferQueue: %s (%d)", strerror(-mInitCheck), mInitCheck); |