Android: Add initialize() function to VideoCapturer interface

webrtc/api/android/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 25 matching lines @@
     : j_video_capturer_(jni, j_video_capturer),
       j_video_capturer_class_(jni, FindClass(jni, "org/webrtc/VideoCapturer")),
       j_observer_class_(
           jni,
           FindClass(jni,
                     "org/webrtc/VideoCapturer$NativeObserver")),
       surface_texture_helper_(SurfaceTextureHelper::create(
           jni, "Camera SurfaceTextureHelper", j_egl_context)),
       capturer_(nullptr) {
   LOG(LS_INFO) << "AndroidVideoCapturerJni ctor";
+  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";
+  jni->CallVoidMethod(
+      *j_video_capturer_,
+      GetMethodID(jni, *j_video_capturer_class_, "initialize",
+                  "(Lorg/webrtc/SurfaceTextureHelper;Landroid/content/"
+                  "Context;Lorg/webrtc/VideoCapturer$CapturerObserver;)V"),
+      surface_texture_helper_
+          ? surface_texture_helper_->GetJavaSurfaceTextureHelper()
+          : nullptr,
+      application_context_, j_frame_observer);
+  CHECK_EXCEPTION(jni) << "error during VideoCapturer.initialize()";
   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()";
 }
 
 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_
-          ? surface_texture_helper_->GetJavaSurfaceTextureHelper()
-          : nullptr,
-      application_context_, j_frame_observer);
+  jmethodID m =
+      GetMethodID(jni(), *j_video_capturer_class_, "startCapture", "(III)V");
+  jni()->CallVoidMethod(*j_video_capturer_, m, width, height, framerate);
   CHECK_EXCEPTION(jni()) << "error during VideoCapturer.startCapture";
 }
 
 void AndroidVideoCapturerJni::Stop() {
   LOG(LS_INFO) << "AndroidVideoCapturerJni stop";
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   {
     // TODO(nisse): Consider moving this block until *after* the call to
     // stopCapturer. stopCapturer should ensure that we get no
     // more frames, and then we shouldn't need the if (!capturer_)
@@ skipping 245 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