summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2012-06-13 14:52:12 -0700
committerJesse Hall <jessehall@google.com>2012-06-22 19:53:00 -0700
commitf15f6e2e7fc51d48ba95890e1f562908e6e957c0 (patch)
treee71aafd5ca7b25a4261dfbf126bb323caa0c69fa
parent0f59d4815400649943716f10305a77c7d56b47c4 (diff)
downloadframeworks_av-f15f6e2e7fc51d48ba95890e1f562908e6e957c0.zip
frameworks_av-f15f6e2e7fc51d48ba95890e1f562908e6e957c0.tar.gz
frameworks_av-f15f6e2e7fc51d48ba95890e1f562908e6e957c0.tar.bz2
Provide new argument to BufferQueue::releaseBuffer
Change-Id: Ib86f1af80a0d2833535a0ad170dce5ac061eec75
-rw-r--r--media/libstagefright/SurfaceMediaSource.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp
index 300d2fc..f1f444e 100644
--- a/media/libstagefright/SurfaceMediaSource.cpp
+++ b/media/libstagefright/SurfaceMediaSource.cpp
@@ -244,7 +244,8 @@ status_t SurfaceMediaSource::read( MediaBuffer **buffer,
if (mStartTimeNs > 0) {
if (item.mTimestamp < mStartTimeNs) {
// This frame predates start of record, discard
- mBufferQueue->releaseBuffer(item.mBuf, EGL_NO_DISPLAY, EGL_NO_SYNC_KHR);
+ mBufferQueue->releaseBuffer(item.mBuf, EGL_NO_DISPLAY,
+ EGL_NO_SYNC_KHR, Fence::NO_FENCE);
continue;
}
mStartTimeNs = item.mTimestamp - mStartTimeNs;
@@ -333,7 +334,8 @@ void SurfaceMediaSource::signalBufferReturned(MediaBuffer *buffer) {
ALOGV("Slot %d returned, matches handle = %p", id,
mBufferSlot[id]->handle);
- mBufferQueue->releaseBuffer(id, EGL_NO_DISPLAY, EGL_NO_SYNC_KHR);
+ mBufferQueue->releaseBuffer(id, EGL_NO_DISPLAY, EGL_NO_SYNC_KHR,
+ Fence::NO_FENCE);
buffer->setObserver(0);
buffer->release();