commit 2ed62b3c9b8218ead78861b68465b63be13baf3a
author Magnus Jedvert <magjed@webrtc.org> Wed Apr 11 14:25:14 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Thu Apr 12 07:19:46 2018 +0000
tree efe08268334c8bbd8095b4119a341a8297511efe
parent 6e641e64b2d9aac6ff1a2c57e70f01a2b99f6d2b

Android: Allow construction of GlTextureFrameBuffer from non-OpenGL thread

This CL makes it possible to create a GlTextureFrameBuffer from any
thread. The actual GL resources will be allocated the first time
setSize() is called. The purpose is to be able to use 'final' variables
more often for this class and avoid @Nullable annotations.

Bug: None
Change-Id: I350304bcd33fd674990254df37a615995972f322
Reviewed-on: https://webrtc-review.googlesource.com/69241
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22835}

sdk/android/api/org/webrtc/EglRenderer.java

diff --git a/sdk/android/api/org/webrtc/EglRenderer.java b/sdk/android/api/org/webrtc/EglRenderer.java
index c6e9812..dccd111 100644
--- a/sdk/android/api/org/webrtc/EglRenderer.java
+++ b/sdk/android/api/org/webrtc/EglRenderer.java
@@ -131,7 +131,8 @@
   private long renderSwapBufferTimeNs;
 
   // Used for bitmap capturing.
-  @Nullable private GlTextureFrameBuffer bitmapTextureFramebuffer;
+  private final GlTextureFrameBuffer bitmapTextureFramebuffer =
+      new GlTextureFrameBuffer(GLES20.GL_RGBA);
 
   private final Runnable logStatisticsRunnable = new Runnable() {
     @Override
@@ -233,10 +234,7 @@
           drawer = null;
         }
         frameDrawer.release();
-        if (bitmapTextureFramebuffer != null) {
-          bitmapTextureFramebuffer.release();
-          bitmapTextureFramebuffer = null;
-        }
+        bitmapTextureFramebuffer.release();
         if (eglBase != null) {
           logD("eglBase detach and release.");
           eglBase.detachCurrent();
@@ -637,9 +635,6 @@
         continue;
       }
 
-      if (bitmapTextureFramebuffer == null) {
-        bitmapTextureFramebuffer = new GlTextureFrameBuffer(GLES20.GL_RGBA);
-      }
       bitmapTextureFramebuffer.setSize(scaledWidth, scaledHeight);
 
       GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, bitmapTextureFramebuffer.getFrameBufferId());