commit 4f2152e3286b03292836fd95813cc95933c79c4d
author Magnus Jedvert <magjed@webrtc.org> Tue Nov 24 13:54:31 2015 +0100
committer Magnus Jedvert <magjed@webrtc.org> Tue Nov 24 12:54:36 2015 +0000
tree f4c3c210a42bc9a947a9885e7f3956a4eea8ef42
parent 97c821dc56a3cfa3674936b012c10b91fd6ea00e

Android SurfaceViewRenderer: Make sure not to call eglCreateSurface() twice

eglCreateSurface() calls are posted to the render thread from both init() and surfaceCreated(). If the render thread does not process the eglCreateSurface() message from init() before surfaceCreated() is called, eglCreateSurface() will be called twice resulting in a crash.

This CL makes sure eglCreateSurface() is only called once.

BUG=b/25815604
R=hbos@webrtc.org

Review URL: https://codereview.webrtc.org/1466133002 .

Cr-Commit-Position: refs/heads/master@{#10769}

talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java

diff --git a/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java b/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java
index f45d53b..1d07112 100644
--- a/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java
+++ b/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java
@@ -173,7 +173,7 @@
     runOnRenderThread(new Runnable() {
       @Override public void run() {
         synchronized (layoutLock) {
-          if (isSurfaceCreated) {
+          if (isSurfaceCreated && !eglBase.hasSurface()) {
             eglBase.createSurface(getHolder().getSurface());
             eglBase.makeCurrent();
             // Necessary for YUV frames with odd width.