diff options
author | Dan Stoza <stoza@google.com> | 2014-04-04 17:36:04 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-04 17:36:04 +0000 |
commit | cffcba5681be302b1c1b40747a1305f2c2a667c3 (patch) | |
tree | 07d2bf1b8ccdd3d32f1ec9785a42e26593c7ddf5 /include | |
parent | 619fd4d6d4d815065becbdf360422ee40dfa7690 (diff) | |
parent | 5205977929c8a63d3bba026c6bd7b4cc1e236627 (diff) | |
download | frameworks_av-cffcba5681be302b1c1b40747a1305f2c2a667c3.zip frameworks_av-cffcba5681be302b1c1b40747a1305f2c2a667c3.tar.gz frameworks_av-cffcba5681be302b1c1b40747a1305f2c2a667c3.tar.bz2 |
Merge "Remove deprecated BufferQueue constructor"
Diffstat (limited to 'include')
-rw-r--r-- | include/media/stagefright/SurfaceMediaSource.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/media/stagefright/SurfaceMediaSource.h b/include/media/stagefright/SurfaceMediaSource.h index 59e83c2..43b75fd 100644 --- a/include/media/stagefright/SurfaceMediaSource.h +++ b/include/media/stagefright/SurfaceMediaSource.h @@ -111,7 +111,7 @@ public: // pass metadata through the buffers. Currently, it is force set to true bool isMetaDataStoredInVideoBuffers() const; - sp<BufferQueue> getBufferQueue() const { return mBufferQueue; } + sp<IGraphicBufferProducer> getProducer() const { return mProducer; } // To be called before start() status_t setMaxAcquiredBufferCount(size_t count); @@ -146,9 +146,10 @@ protected: static bool isExternalFormat(uint32_t format); private: - // mBufferQueue is the exchange point between the producer and - // this consumer - sp<BufferQueue> mBufferQueue; + // A BufferQueue, represented by these interfaces, is the exchange point + // between the producer and this consumer + sp<IGraphicBufferProducer> mProducer; + sp<IGraphicBufferConsumer> mConsumer; struct SlotData { sp<GraphicBuffer> mGraphicBuffer; |