VideoCapturerAndroid: Add custom nativeCreateVideoCapturer()

talk/app/webrtc/java/jni/peerconnection_jni.cc

 /*
  * libjingle
  * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 1654 matching lines @@
   return JavaEnumFromIndex(jni, "MediaSource$State", p->state());
 }
 
 JOW(jobject, VideoCapturer_nativeCreateVideoCapturer)(
     JNIEnv* jni, jclass, jstring j_device_name) {
 // Since we can't create platform specific java implementations in Java, we
 // defer the creation to C land.
 #if defined(ANDROID)
   jclass j_video_capturer_class(
       FindClass(jni, "org/webrtc/VideoCapturerAndroid"));
-  const jmethodID j_videocapturer_ctor(GetMethodID(
-      jni, j_video_capturer_class, "<init>", "()V"));
-  jobject j_video_capturer = jni->NewObject(j_video_capturer_class,
-                                            j_videocapturer_ctor);
-  CHECK_EXCEPTION(jni) << "error during NewObject";
-
-  rtc::scoped_refptr<AndroidVideoCapturerJni> delegate =
-      AndroidVideoCapturerJni::Create(jni, j_video_capturer, j_device_name);
-  if (!delegate.get())
+  const int camera_id = jni->CallStaticIntMethod(
+      j_video_capturer_class,
+      GetStaticMethodID(jni, j_video_capturer_class, "lookupDeviceName",
+                        "(Ljava/lang/String;)I"),
+      j_device_name);
+  CHECK_EXCEPTION(jni) << "error during VideoCapturerAndroid.lookupDeviceName";
+  if (camera_id == -1)
     return nullptr;
-  rtc::scoped_ptr<webrtc::AndroidVideoCapturer> capturer(
+  jobject j_video_capturer = jni->NewObject(
+      j_video_capturer_class,
+      GetMethodID(jni, j_video_capturer_class, "<init>", "(I)V"), camera_id);
+  CHECK_EXCEPTION(jni) << "error during creation of VideoCapturerAndroid";
+  rtc::scoped_refptr<webrtc::AndroidVideoCapturerDelegate> delegate =
+      new rtc::RefCountedObject<AndroidVideoCapturerJni>(jni, j_video_capturer);
+  rtc::scoped_ptr<cricket::VideoCapturer> capturer(
       new webrtc::AndroidVideoCapturer(delegate));
 
 #else
   std::string device_name = JavaToStdString(jni, j_device_name);
   scoped_ptr<cricket::DeviceManagerInterface> device_manager(
       cricket::DeviceManagerFactory::Create());
   RTC_CHECK(device_manager->Init()) << "DeviceManager::Init() failed";
   cricket::Device device;
   if (!device_manager->GetVideoCaptureDevice(device_name, &device)) {
     LOG(LS_ERROR) << "GetVideoCaptureDevice failed for " << device_name;
     return 0;
   }
   scoped_ptr<cricket::VideoCapturer> capturer(
       device_manager->CreateVideoCapturer(device));
 
   jclass j_video_capturer_class(
       FindClass(jni, "org/webrtc/VideoCapturer"));
   const jmethodID j_videocapturer_ctor(GetMethodID(
       jni, j_video_capturer_class, "<init>", "()V"));
   jobject j_video_capturer =
       jni->NewObject(j_video_capturer_class,
                      j_videocapturer_ctor);
   CHECK_EXCEPTION(jni) << "error during creation of VideoCapturer";
 
 #endif
   const jmethodID j_videocapturer_set_native_capturer(GetMethodID(
       jni, j_video_capturer_class, "setNativeCapturer", "(J)V"));
   jni->CallVoidMethod(j_video_capturer,
                       j_videocapturer_set_native_capturer,
-                      (jlong)capturer.release());
+                      jlongFromPointer(capturer.release()));
   CHECK_EXCEPTION(jni) << "error during setNativeCapturer";
   return j_video_capturer;
 }
 
 JOW(jlong, VideoRenderer_nativeCreateGuiVideoRenderer)(
     JNIEnv* jni, jclass, int x, int y) {
   scoped_ptr<VideoRendererWrapper> renderer(VideoRendererWrapper::Create(
       cricket::VideoRendererFactory::CreateGuiVideoRenderer(x, y)));
   return (jlong)renderer.release();
 }
@@ skipping 135 matching lines @@
   rtc::scoped_ptr<jbyte> buffer(static_cast<jbyte*>(malloc(log_size)));
   stream->ReadAll(buffer.get(), log_size, &read, nullptr);
 
   jbyteArray result = jni->NewByteArray(read);
   jni->SetByteArrayRegion(result, 0, read, buffer.get());
 
   return result;
 }
 
 }  // namespace webrtc_jni