summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-03-13 23:26:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 23:26:38 +0000
commit5b835698486077c5b1fd81b9fd741dfd7ff37cb3 (patch)
tree5ae0493b518b7acb6d2027ea0952d04c667b52a3
parent0b89a66c96b409f51e882b7d065d4b8562884faf (diff)
parent1c608ab33acab82d4a87f1abedcc99a623d1b53a (diff)
downloadframeworks_av-5b835698486077c5b1fd81b9fd741dfd7ff37cb3.zip
frameworks_av-5b835698486077c5b1fd81b9fd741dfd7ff37cb3.tar.gz
frameworks_av-5b835698486077c5b1fd81b9fd741dfd7ff37cb3.tar.bz2
am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspended
* commit '1c608ab33acab82d4a87f1abedcc99a623d1b53a': 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);
}