Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

webrtc/api/java/jni/androidvideocapturer_jni.cc

 /*
  *  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 12 matching lines @@
 int AndroidVideoCapturerJni::SetAndroidObjects(JNIEnv* jni,
                                                jobject appliction_context) {
   if (application_context_) {
     jni->DeleteGlobalRef(application_context_);
   }
   application_context_ = NewGlobalRef(jni, appliction_context);
 
   return 0;
 }
 
-AndroidVideoCapturerJni::AndroidVideoCapturerJni(
-    JNIEnv* jni,
-    jobject j_video_capturer,
-    jobject j_egl_context)
+AndroidVideoCapturerJni::AndroidVideoCapturerJni(JNIEnv* jni,
+                                                 jobject j_video_capturer,
+                                                 jobject j_egl_context)
     : j_video_capturer_(jni, j_video_capturer),
-      j_video_capturer_class_(
-          jni, FindClass(jni, "org/webrtc/VideoCapturer")),
+      j_video_capturer_class_(jni, FindClass(jni, "org/webrtc/VideoCapturer")),
       j_observer_class_(
           jni,
           FindClass(jni,
                     "org/webrtc/VideoCapturer$NativeObserver")),
-      surface_texture_helper_(new rtc::RefCountedObject<SurfaceTextureHelper>(
+      surface_texture_helper_(SurfaceTextureHelper::create(
           jni, "Camera SurfaceTextureHelper", j_egl_context)),
       capturer_(nullptr) {
   LOG(LS_INFO) << "AndroidVideoCapturerJni ctor";
   thread_checker_.DetachFromThread();
 }
 
 AndroidVideoCapturerJni::~AndroidVideoCapturerJni() {
   LOG(LS_INFO) << "AndroidVideoCapturerJni dtor";
   jni()->CallVoidMethod(
       *j_video_capturer_,
       GetMethodID(jni(), *j_video_capturer_class_, "dispose", "()V"));
   CHECK_EXCEPTION(jni()) << "error during VideoCapturer.dispose()";
-  jni()->CallVoidMethod(
-      surface_texture_helper_->GetJavaSurfaceTextureHelper(),
-      GetMethodID(jni(), FindClass(jni(), "org/webrtc/SurfaceTextureHelper"),
-                  "dispose", "()V"));
+  if (surface_texture_helper_) {
+    jni()->CallVoidMethod(
+        surface_texture_helper_->GetJavaSurfaceTextureHelper(),
+        GetMethodID(jni(), FindClass(jni(), "org/webrtc/SurfaceTextureHelper"),
+                    "dispose", "()V"));
+  }
   CHECK_EXCEPTION(jni()) << "error during SurfaceTextureHelper.dispose()";
 }
 
 void AndroidVideoCapturerJni::Start(int width, int height, int framerate,
                                     webrtc::AndroidVideoCapturer* capturer) {
   LOG(LS_INFO) << "AndroidVideoCapturerJni start";
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   {
     rtc::CritScope cs(&capturer_lock_);
     RTC_CHECK(capturer_ == nullptr);
     RTC_CHECK(invoker_.get() == nullptr);
     capturer_ = capturer;
     invoker_.reset(new rtc::GuardedAsyncInvoker());
   }
   jobject j_frame_observer =
       jni()->NewObject(*j_observer_class_,
                        GetMethodID(jni(), *j_observer_class_, "<init>", "(J)V"),
                        jlongFromPointer(this));
   CHECK_EXCEPTION(jni()) << "error during NewObject";
 
   jmethodID m = GetMethodID(
       jni(), *j_video_capturer_class_, "startCapture",
       "(IIILorg/webrtc/SurfaceTextureHelper;Landroid/content/Context;"
       "Lorg/webrtc/VideoCapturer$CapturerObserver;)V");
-  jni()->CallVoidMethod(*j_video_capturer_,
-                        m, width, height,
-                        framerate,
-                        surface_texture_helper_->GetJavaSurfaceTextureHelper(),
-                        application_context_,
-                        j_frame_observer);
+  jni()->CallVoidMethod(
+      *j_video_capturer_, m, width, height, framerate,
+      surface_texture_helper_
+          ? surface_texture_helper_->GetJavaSurfaceTextureHelper()
+          : nullptr,
+      application_context_, j_frame_observer);
   CHECK_EXCEPTION(jni()) << "error during VideoCapturer.startCapture";
 }
 
 void AndroidVideoCapturerJni::Stop() {
   LOG(LS_INFO) << "AndroidVideoCapturerJni stop";
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   {
     rtc::CritScope cs(&capturer_lock_);
     // Destroying |invoker_| will cancel all pending calls to |capturer_|.
     invoker_ = nullptr;
@@ skipping 138 matching lines @@
 
 JOW(void, VideoCapturer_00024NativeObserver_nativeOnOutputFormatRequest)
     (JNIEnv* jni, jclass, jlong j_capturer, jint j_width, jint j_height,
         jint j_fps) {
   LOG(LS_INFO) << "NativeObserver_nativeOnOutputFormatRequest";
   reinterpret_cast<AndroidVideoCapturerJni*>(j_capturer)->OnOutputFormatRequest(
       j_width, j_height, j_fps);
 }
 
 }  // namespace webrtc_jni