update to Fence::waitForever() API change
Bug: 8988871
Change-Id: I24a2620d356f3bb6207ed834c79fd3e48b429695
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 @@
// 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 @@
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 @@
}
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)",