diff options
Diffstat (limited to 'media/libstagefright/filters')
-rw-r--r-- | media/libstagefright/filters/GraphicBufferListener.cpp | 12 | ||||
-rw-r--r-- | media/libstagefright/filters/GraphicBufferListener.h | 6 | ||||
-rw-r--r-- | media/libstagefright/filters/MediaFilter.cpp | 4 |
3 files changed, 12 insertions, 10 deletions
diff --git a/media/libstagefright/filters/GraphicBufferListener.cpp b/media/libstagefright/filters/GraphicBufferListener.cpp index fa38192..66374ba 100644 --- a/media/libstagefright/filters/GraphicBufferListener.cpp +++ b/media/libstagefright/filters/GraphicBufferListener.cpp @@ -21,6 +21,8 @@ #include <media/stagefright/foundation/AMessage.h> #include <media/stagefright/MediaErrors.h> +#include <gui/BufferItem.h> + #include "GraphicBufferListener.h" namespace android { @@ -83,8 +85,8 @@ void GraphicBufferListener::onSidebandStreamChanged() { // nothing to do } -BufferQueue::BufferItem GraphicBufferListener::getBufferItem() { - BufferQueue::BufferItem item; +BufferItem GraphicBufferListener::getBufferItem() { + BufferItem item; { Mutex::Autolock autoLock(mMutex); @@ -124,8 +126,7 @@ BufferQueue::BufferItem GraphicBufferListener::getBufferItem() { return item; } -sp<GraphicBuffer> GraphicBufferListener::getBuffer( - BufferQueue::BufferItem item) { +sp<GraphicBuffer> GraphicBufferListener::getBuffer(BufferItem item) { sp<GraphicBuffer> buf; if (item.mBuf < 0 || item.mBuf >= BufferQueue::NUM_BUFFER_SLOTS) { ALOGE("getBuffer() received invalid BufferItem: mBuf==%d", item.mBuf); @@ -138,8 +139,7 @@ sp<GraphicBuffer> GraphicBufferListener::getBuffer( return buf; } -status_t GraphicBufferListener::releaseBuffer( - BufferQueue::BufferItem item) { +status_t GraphicBufferListener::releaseBuffer(BufferItem item) { if (item.mBuf < 0 || item.mBuf >= BufferQueue::NUM_BUFFER_SLOTS) { ALOGE("getBuffer() received invalid BufferItem: mBuf==%d", item.mBuf); return ERROR_OUT_OF_RANGE; diff --git a/media/libstagefright/filters/GraphicBufferListener.h b/media/libstagefright/filters/GraphicBufferListener.h index b3e0ee3..586bf65 100644 --- a/media/libstagefright/filters/GraphicBufferListener.h +++ b/media/libstagefright/filters/GraphicBufferListener.h @@ -41,9 +41,9 @@ public: return mProducer; } - BufferQueue::BufferItem getBufferItem(); - sp<GraphicBuffer> getBuffer(BufferQueue::BufferItem item); - status_t releaseBuffer(BufferQueue::BufferItem item); + BufferItem getBufferItem(); + sp<GraphicBuffer> getBuffer(BufferItem item); + status_t releaseBuffer(BufferItem item); enum { kWhatFrameAvailable = 'frav', diff --git a/media/libstagefright/filters/MediaFilter.cpp b/media/libstagefright/filters/MediaFilter.cpp index d2f662d..0a09575 100644 --- a/media/libstagefright/filters/MediaFilter.cpp +++ b/media/libstagefright/filters/MediaFilter.cpp @@ -31,6 +31,8 @@ #include <media/stagefright/MediaErrors.h> #include <media/stagefright/MediaFilter.h> +#include <gui/BufferItem.h> + #include "ColorConvert.h" #include "GraphicBufferListener.h" #include "IntrinsicBlurFilter.h" @@ -749,7 +751,7 @@ void MediaFilter::onCreateInputSurface() { } void MediaFilter::onInputFrameAvailable() { - BufferQueue::BufferItem item = mGraphicBufferListener->getBufferItem(); + BufferItem item = mGraphicBufferListener->getBufferItem(); sp<GraphicBuffer> buf = mGraphicBufferListener->getBuffer(item); // get pointer to graphic buffer |