Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

webrtc/api/java/android/org/webrtc/SurfaceTextureHelper.java

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 32 matching lines @@
    * SurfaceTextureHelper constructor. The callee is not allowed to make another EGLContext current
    * on the calling thread.
    */
   public interface OnTextureFrameAvailableListener {
     abstract void onTextureFrameAvailable(
         int oesTextureId, float[] transformMatrix, long timestampNs);
   }
 
   /**
    * Construct a new SurfaceTextureHelper sharing OpenGL resources with |sharedContext|. A dedicated
-   * thread and handler is created for handling the SurfaceTexture.
+   * thread and handler is created for handling the SurfaceTexture. May return null if EGL fails to
+   * initialize a pixel buffer surface and make it current.
    */
   public static SurfaceTextureHelper create(
       final String threadName, final EglBase.Context sharedContext) {
     final HandlerThread thread = new HandlerThread(threadName);
     thread.start();
     final Handler handler = new Handler(thread.getLooper());
 
     // The onFrameAvailable() callback will be executed on the SurfaceTexture ctor thread. See:
     // http://grepcode.com/file/repository.grepcode.com/java/ext/com.google.android/android/5.1.1_r1/android/graphics/SurfaceTexture.java#195.
     // Therefore, in order to control the callback thread on API lvl < 21, the SurfaceTextureHelper
     // is constructed on the |handler| thread.
     return ThreadUtils.invokeUninterruptibly(handler, new Callable<SurfaceTextureHelper>() {
       @Override
       public SurfaceTextureHelper call() {
-        return new SurfaceTextureHelper(sharedContext, handler);
+        try {
+          return new SurfaceTextureHelper(sharedContext, handler);
+        } catch (RuntimeException e) {
+          Logging.e(TAG, threadName + " create failure", e);
+          return null;
+        }
       }
     });
   }
 
   // State for YUV conversion, instantiated on demand.
   static private class YuvConverter {
     private final EglBase eglBase;
     private final GlShader shader;
     private boolean released = false;
 
@@ skipping 229 matching lines @@
     }
   };
 
   private SurfaceTextureHelper(EglBase.Context sharedContext, Handler handler) {
     if (handler.getLooper().getThread() != Thread.currentThread()) {
       throw new IllegalStateException("SurfaceTextureHelper must be created on the handler thread");
     }
     this.handler = handler;
 
     eglBase = EglBase.create(sharedContext, EglBase.CONFIG_PIXEL_BUFFER);
-    eglBase.createDummyPbufferSurface();
-    eglBase.makeCurrent();
+    try {
+      // Both these statements have been observed to fail on rare occasions.

[perkj_webrtc, 2016/05/09 13:28:36]

Can you file an open source bug with information on how they have failed and add
a link here as documentation? 

[magjed_webrtc, 2016/05/09 14:30:21]

Done.

+      eglBase.createDummyPbufferSurface();
+      eglBase.makeCurrent();
+    } catch (RuntimeException e) {
+      // Clean up before rethrowing the exception.
+      eglBase.release();
+      handler.getLooper().quit();
+      throw e;
+    }
 
     oesTextureId = GlUtil.generateTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
     surfaceTexture = new SurfaceTexture(oesTextureId);
     surfaceTexture.setOnFrameAvailableListener(new SurfaceTexture.OnFrameAvailableListener() {
       @Override
       public void onFrameAvailable(SurfaceTexture surfaceTexture) {
         hasPendingTexture = true;
         tryDeliverTextureFrame();
       }
     });
@@ skipping 146 matching lines @@
     synchronized (this) {
       if (yuvConverter != null)
         yuvConverter.release();
     }
     GLES20.glDeleteTextures(1, new int[] {oesTextureId}, 0);
     surfaceTexture.release();
     eglBase.release();
     handler.getLooper().quit();
   }
 }