Snap for 5220107 from 06c5d535332898944d627b6e114d1f39ae3e6c86 to pi-b4s4-release
Change-Id: Ic78b5df8e9ebf1755daf515dda6c8f93326d27be
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 251420f..7f39d10 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -783,9 +783,6 @@
// need to enable allocation when attaching
surface->getIGraphicBufferProducer()->allowAllocation(true);
- // dequeueBuffer cannot time out
- surface->setDequeueTimeout(-1);
-
// for meta data mode, we move dequeud buffers to the new surface.
// for non-meta mode, we must move all registered buffers
for (size_t i = 0; i < buffers.size(); ++i) {
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index c4f0410..353e407 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -2198,7 +2198,6 @@
}
if (mime.startsWithIgnoreCase("video/")) {
- mSurface->setDequeueTimeout(-1);
mSoftRenderer = new SoftwareRenderer(mSurface, mRotationDegrees);
}
}
@@ -2486,7 +2485,6 @@
&& (mFlags & kFlagPushBlankBuffersOnShutdown)) {
pushBlankBuffersToNativeWindow(mSurface.get());
}
- surface->setDequeueTimeout(-1);
mSoftRenderer = new SoftwareRenderer(surface);
// TODO: check if this was successful
} else {
