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 | |
| 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
5 files changed, 4 insertions, 8 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 diff --git a/services/camera/libcameraservice/camera3/Camera3Stream.cpp b/services/camera/libcameraservice/camera3/Camera3Stream.cpp index f137227..9c9c258 100644 --- a/services/camera/libcameraservice/camera3/Camera3Stream.cpp +++ b/services/camera/libcameraservice/camera3/Camera3Stream.cpp @@ -296,8 +296,7 @@ status_t Camera3Stream::registerBuffersLocked(camera3_device *hal3Device) { } sp<Fence> fence = new Fence(streamBuffers[bufferIdx].acquire_fence); - fence->waitForever(kRegisterFenceTimeoutMs, - "Camera3Stream::registerBuffers"); + fence->waitForever("Camera3Stream::registerBuffers"); buffers.editItemAt(bufferIdx) = streamBuffers[bufferIdx].buffer; } diff --git a/services/camera/libcameraservice/camera3/Camera3Stream.h b/services/camera/libcameraservice/camera3/Camera3Stream.h index d992cfe..4b3b346 100644 --- a/services/camera/libcameraservice/camera3/Camera3Stream.h +++ b/services/camera/libcameraservice/camera3/Camera3Stream.h @@ -263,8 +263,6 @@ class Camera3Stream : virtual size_t getBufferCountLocked() = 0; private: - static const unsigned int kRegisterFenceTimeoutMs = 5000; - uint32_t oldUsage; uint32_t oldMaxBuffers; diff --git a/services/camera/libcameraservice/gui/RingBufferConsumer.cpp b/services/camera/libcameraservice/gui/RingBufferConsumer.cpp index c7790fc..2fa78a4 100644 --- a/services/camera/libcameraservice/gui/RingBufferConsumer.cpp +++ b/services/camera/libcameraservice/gui/RingBufferConsumer.cpp @@ -108,7 +108,7 @@ sp<PinnedBufferItem> RingBufferConsumer::pinSelectedBuffer( } if (waitForFence) { - status_t err = pinnedBuffer->getBufferItem().mFence->waitForever(1000, + status_t err = pinnedBuffer->getBufferItem().mFence->waitForever( "RingBufferConsumer::pinSelectedBuffer"); if (err != OK) { BI_LOGE("Failed to wait for fence of acquired buffer: %s (%d)", |