diff options
author | Andy McFadden <fadden@android.com> | 2013-10-24 17:35:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-24 17:35:44 +0000 |
commit | be567be3f92026f5964c1c9ecce00e30bb7df412 (patch) | |
tree | 15d65f1a28fa055b11dabd1173fe5001e5d70eed | |
parent | f3a6234ba21640cf2bc893dbcb98fb9b0fa47481 (diff) | |
parent | bdfd4885aa4d7b3f3f591118927a3f4aec593096 (diff) | |
download | frameworks_av-be567be3f92026f5964c1c9ecce00e30bb7df412.zip frameworks_av-be567be3f92026f5964c1c9ecce00e30bb7df412.tar.gz frameworks_av-be567be3f92026f5964c1c9ecce00e30bb7df412.tar.bz2 |
Merge "Check for NULL buffer in repeat-latest" into klp-dev
-rw-r--r-- | media/libstagefright/omx/GraphicBufferSource.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/media/libstagefright/omx/GraphicBufferSource.cpp b/media/libstagefright/omx/GraphicBufferSource.cpp index cf43e94..f295e5a 100644 --- a/media/libstagefright/omx/GraphicBufferSource.cpp +++ b/media/libstagefright/omx/GraphicBufferSource.cpp @@ -384,6 +384,23 @@ bool GraphicBufferSource::repeatLatestSubmittedBuffer_l() { if (mLatestSubmittedBufferId < 0 || mSuspended) { return false; } + if (mBufferSlot[mLatestSubmittedBufferId] == NULL) { + // This can happen if the remote side disconnects, causing + // onBuffersReleased() to NULL out our copy of the slots. The + // buffer is gone, so we have nothing to show. + // + // To be on the safe side we try to release the buffer. + ALOGD("repeatLatestSubmittedBuffer_l: slot was NULL"); + mBufferQueue->releaseBuffer( + mLatestSubmittedBufferId, + mLatestSubmittedBufferFrameNum, + EGL_NO_DISPLAY, + EGL_NO_SYNC_KHR, + Fence::NO_FENCE); + mLatestSubmittedBufferId = -1; + mLatestSubmittedBufferFrameNum = 0; + return false; + } int cbi = findAvailableCodecBuffer_l(); if (cbi < 0) { |