admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a deadlock in EglRenderer.releaseEglSurface.

Browse Source 
Main thread is waiting for an operation on the render thread to complete
while holding the handler lock. Something can be waiting on the render
thread for this lock. This CL changes the behaviour so that the lock
is released before waiting for the operation to complete.

BUG=webrtc:6602,webrtc:6470
R=magjed@webrtc.org

Review-Url: https://codereview.webrtc.org/2449693003
Cr-Commit-Position: refs/heads/master@{#14773}
This commit is contained in:
sakal 2016-10-25 07:20:52 -07:00 committed by Commit bot
parent 2d81eb33f5
commit d0af5c6fd4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/api/android/java/src/org/webrtc/EglRenderer.java
View File

@ -380,23 +380,28 @@ public class EglRenderer implements VideoRenderer.Callbacks {
* Release EGL surface. This function will block until the EGL surface is released.
*/
public void releaseEglSurface() {
final CountDownLatch completionLatch = new CountDownLatch(1);
// Ensure that the render thread is no longer touching the Surface before returning from this
// function.
eglSurfaceCreationRunnable.setSurface(null /* surface */);
synchronized (handlerLock) {
if (renderThreadHandler != null) {
renderThreadHandler.removeCallbacks(eglSurfaceCreationRunnable);
ThreadUtils.invokeAtFrontUninterruptibly(renderThreadHandler, new Runnable() {
renderThreadHandler.postAtFrontOfQueue(new Runnable() {
@Override
public void run() {
if (eglBase != null) {
eglBase.detachCurrent();
eglBase.releaseSurface();
}
completionLatch.countDown();
}
});
} else {
completionLatch.countDown();
}
}
ThreadUtils.awaitUninterruptibly(completionLatch);
}
/**