commit bf2004bc3735c7cd12e345b469c3994b72629047
author Magnus Jedvert <magjed@webrtc.org> Thu Oct 08 18:58:07 2015 +0200
committer Magnus Jedvert <magjed@webrtc.org> Thu Oct 08 16:58:33 2015 +0000
tree e8eb1ffe94b67334a983d28cde0a225036a875ff
parent 4e572470a3f181a043f9f9b98cc0153b7195b9f5

Android SurfaceViewRenderer: Only clear image in release() if initialized

This CL is a small bug fix for "Android SurfaceViewRenderer: Allow to re-init after release() has been called" https://codereview.webrtc.org/1389203003/. It is only possible to clear the last image in release() if init() has been called beforehand.

TBR=hbos
BUG=webrtc:4742

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

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

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 28404c9..b91d086 100644
--- a/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java
+++ b/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java
@@ -206,9 +206,11 @@
             GLES20.glDeleteTextures(3, yuvTextures, 0);
             yuvTextures = null;
           }
-          // Clear last rendered image to black.
-          GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
-          eglBase.swapBuffers();
+          if (eglBase.hasSurface()) {
+            // Clear last rendered image to black.
+            GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
+            eglBase.swapBuffers();
+          }
           eglBase.release();
           eglBase = null;
         }