| commit | d76442421eadfa73f2f3a9e50f6caf65b0dd1ce9 | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Thu May 16 18:07:35 2013 -0700 |
| committer | Mathias Agopian <mathias@google.com> | Thu May 16 18:54:49 2013 -0700 |
| tree | 072daaa9f330bac83e9c7e0ca389feba3a39ecda | |
| parent | 99f27cdf2c2711aa0c8b4d9ae4d12cae37ff94f6 [diff] |
update to Fence::waitForever() API change Bug: 8988871 Change-Id: I24a2620d356f3bb6207ed834c79fd3e48b429695
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 @@ } 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 @@ 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 @@ } 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)",