diff options
| author | Mathias Agopian <mathias@google.com> | 2013-05-16 18:07:35 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2013-05-16 18:54:49 -0700 |
| commit | d76442421eadfa73f2f3a9e50f6caf65b0dd1ce9 (patch) | |
| tree | 072daaa9f330bac83e9c7e0ca389feba3a39ecda /media | |
| parent | 99f27cdf2c2711aa0c8b4d9ae4d12cae37ff94f6 (diff) | |
| download | frameworks_av-d76442421eadfa73f2f3a9e50f6caf65b0dd1ce9.zip frameworks_av-d76442421eadfa73f2f3a9e50f6caf65b0dd1ce9.tar.gz frameworks_av-d76442421eadfa73f2f3a9e50f6caf65b0dd1ce9.tar.bz2 | |
update to Fence::waitForever() API change
Bug: 8988871
Change-Id: I24a2620d356f3bb6207ed834c79fd3e48b429695
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/SurfaceMediaSource.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/omx/GraphicBufferSource.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp index 0345de6..409038a 100644 --- a/media/libstagefright/SurfaceMediaSource.cpp +++ b/media/libstagefright/SurfaceMediaSource.cpp @@ -298,7 +298,7 @@ status_t SurfaceMediaSource::read( MediaBuffer **buffer, // wait for a buffer to be queued mFrameAvailableCondition.wait(mMutex); } else if (err == OK) { - err = item.mFence->waitForever(1000, "SurfaceMediaSource::read"); + err = item.mFence->waitForever("SurfaceMediaSource::read"); if (err) { ALOGW("read: failed to wait for buffer fence: %d", err); } diff --git a/media/libstagefright/omx/GraphicBufferSource.cpp b/media/libstagefright/omx/GraphicBufferSource.cpp index 3854e52..b91004c 100644 --- a/media/libstagefright/omx/GraphicBufferSource.cpp +++ b/media/libstagefright/omx/GraphicBufferSource.cpp @@ -274,8 +274,7 @@ bool GraphicBufferSource::fillCodecBuffer_l() { mNumFramesAvailable--; // Wait for it to become available. - err = item.mFence->waitForever(1000, - "GraphicBufferSource::fillCodecBuffer_l"); + err = item.mFence->waitForever("GraphicBufferSource::fillCodecBuffer_l"); if (err != OK) { ALOGW("failed to wait for buffer fence: %d", err); // keep going |