summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-01-31 03:14:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-01-31 03:14:59 +0000
commit5ce88270eb2d41462de8c4155673b802b2ca48cb (patch)
tree1953d849c9450f68d12d8b4177f013378ccf5324
parent5fc2918fb08fc0d3a752e226f85b17af9587b2ef (diff)
parent49270665e7a20cd120724fc388da8b166ff0b4f1 (diff)
downloadframeworks_av-5ce88270eb2d41462de8c4155673b802b2ca48cb.zip
frameworks_av-5ce88270eb2d41462de8c4155673b802b2ca48cb.tar.gz
frameworks_av-5ce88270eb2d41462de8c4155673b802b2ca48cb.tar.bz2
Merge "save mGraphicBuffer pointer even when we're suspended"
-rw-r--r--media/libstagefright/omx/GraphicBufferSource.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/omx/GraphicBufferSource.cpp b/media/libstagefright/omx/GraphicBufferSource.cpp
index b8970ad..7492577 100644
--- a/media/libstagefright/omx/GraphicBufferSource.cpp
+++ b/media/libstagefright/omx/GraphicBufferSource.cpp
@@ -609,6 +609,12 @@ void GraphicBufferSource::onFrameAvailable() {
BufferQueue::BufferItem item;
status_t err = mBufferQueue->acquireBuffer(&item, 0);
if (err == OK) {
+ // If this is the first time we're seeing this buffer, add it to our
+ // slot table.
+ if (item.mGraphicBuffer != NULL) {
+ ALOGV("fillCodecBuffer_l: setting mBufferSlot %d", item.mBuf);
+ mBufferSlot[item.mBuf] = item.mGraphicBuffer;
+ }
mBufferQueue->releaseBuffer(item.mBuf, item.mFrameNumber,
EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, item.mFence);
}