Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

webrtc/api/java/jni/surfacetexturehelper_jni.h

Index: webrtc/api/java/jni/surfacetexturehelper_jni.h
diff --git a/webrtc/api/java/jni/surfacetexturehelper_jni.h b/webrtc/api/java/jni/surfacetexturehelper_jni.h
index 849c66b5dd2ca6e418d47b82c376ffd392fbbe47..acdb8a469202e9b9c8d3ed26bdfeaf006cc49198 100644
--- a/webrtc/api/java/jni/surfacetexturehelper_jni.h
+++ b/webrtc/api/java/jni/surfacetexturehelper_jni.h
@@ -38,9 +38,9 @@ namespace webrtc_jni {
 // 4. Call CreateTextureFrame to wrap the Java texture in a VideoFrameBuffer.
 class SurfaceTextureHelper : public rtc::RefCountInterface {
  public:
-  SurfaceTextureHelper(JNIEnv* jni,
-                       const char* thread_name,
-                       jobject j_egl_context);
+  // Might return null if creating the Java SurfaceTextureHelper fails.
+  static rtc::scoped_refptr<SurfaceTextureHelper> create(
+      JNIEnv* jni, const char* thread_name, jobject j_egl_context);
 
   jobject GetJavaSurfaceTextureHelper() const;
 
@@ -53,6 +53,10 @@ class SurfaceTextureHelper : public rtc::RefCountInterface {
   ~SurfaceTextureHelper();
 
  private:
+  SurfaceTextureHelper(JNIEnv* jni, jobject j_surface_texture_helper);
+  // RefCountedObject needs access to the private ctor.

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

just make the ctor protected instead.

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

Done.

+  friend class rtc::RefCountedObject<SurfaceTextureHelper>;
+
   //  May be called on arbitrary thread.
   void ReturnTextureFrame() const;