diff options
| author | Mathias Agopian <mathias@google.com> | 2013-05-17 17:15:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-17 17:15:08 +0000 |
| commit | e2dfa5a4ea3459b155b4b403b7dafe2116d960d4 (patch) | |
| tree | c6ed1694851a3fe9d43773dc2b360729c3f90837 /media | |
| parent | 4224dedff0451e0aea3b8f5c3aaf5f2ad0eac1dd (diff) | |
| parent | d76442421eadfa73f2f3a9e50f6caf65b0dd1ce9 (diff) | |
| download | frameworks_av-e2dfa5a4ea3459b155b4b403b7dafe2116d960d4.zip frameworks_av-e2dfa5a4ea3459b155b4b403b7dafe2116d960d4.tar.gz frameworks_av-e2dfa5a4ea3459b155b4b403b7dafe2116d960d4.tar.bz2 | |
Merge "update to Fence::waitForever() API change" into jb-mr2-dev
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 45a70e7..ef27879 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 |