diff options
| author | Mathias Agopian <mathias@google.com> | 2013-05-17 10:16:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-17 10:16:50 -0700 |
| commit | 074eb387091ca464257601a2d23020e3e10a6915 (patch) | |
| tree | fbb123bc21fa69026c0d4ed4f4bb426fd3e71f0a /services | |
| parent | b07d3c48ea7dcb5bb41c8f5d93b23ac6c42b15dc (diff) | |
| parent | e2dfa5a4ea3459b155b4b403b7dafe2116d960d4 (diff) | |
| download | frameworks_av-074eb387091ca464257601a2d23020e3e10a6915.zip frameworks_av-074eb387091ca464257601a2d23020e3e10a6915.tar.gz frameworks_av-074eb387091ca464257601a2d23020e3e10a6915.tar.bz2 | |
am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-dev
* commit 'e2dfa5a4ea3459b155b4b403b7dafe2116d960d4':
update to Fence::waitForever() API change
Diffstat (limited to 'services')
3 files changed, 2 insertions, 5 deletions
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)", |