2 files changed, 409 insertions, 0 deletions
diff --git a/third_party/libwebrtc/modules/utility/source/helpers_android.cc b/third_party/libwebrtc/modules/utility/source/helpers_android.cc
new file mode 100644
index 0000000000..9cfee8a2af
--- /dev/null
+++ b/third_party/libwebrtc/modules/utility/source/helpers_android.cc
@@ -0,0 +1,117 @@
+/*
+ *  Copyright (c) 2013 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.
+ */
+
+#include "modules/utility/include/helpers_android.h"
+
+#include <android/log.h>
+#include <pthread.h>
+#include <stddef.h>
+#include <unistd.h>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/platform_thread.h"
+
+#define TAG "HelpersAndroid"
+#define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__)
+
+namespace webrtc {
+
+JNIEnv* GetEnv(JavaVM* jvm) {
+  void* env = NULL;
+  jint status = jvm->GetEnv(&env, JNI_VERSION_1_6);
+  RTC_CHECK(((env != NULL) && (status == JNI_OK)) ||
+            ((env == NULL) && (status == JNI_EDETACHED)))
+      << "Unexpected GetEnv return: " << status << ":" << env;
+  return reinterpret_cast<JNIEnv*>(env);
+}
+
+// Return a `jlong` that will correctly convert back to `ptr`.  This is needed
+// because the alternative (of silently passing a 32-bit pointer to a vararg
+// function expecting a 64-bit param) picks up garbage in the high 32 bits.
+jlong PointerTojlong(void* ptr) {
+  static_assert(sizeof(intptr_t) <= sizeof(jlong),
+                "Time to rethink the use of jlongs");
+  // Going through intptr_t to be obvious about the definedness of the
+  // conversion from pointer to integral type.  intptr_t to jlong is a standard
+  // widening by the static_assert above.
+  jlong ret = reinterpret_cast<intptr_t>(ptr);
+  RTC_DCHECK(reinterpret_cast<void*>(ret) == ptr);
+  return ret;
+}
+
+jmethodID GetMethodID(JNIEnv* jni,
+                      jclass c,
+                      const char* name,
+                      const char* signature) {
+  jmethodID m = jni->GetMethodID(c, name, signature);
+  CHECK_EXCEPTION(jni) << "Error during GetMethodID: " << name << ", "
+                       << signature;
+  RTC_CHECK(m) << name << ", " << signature;
+  return m;
+}
+
+jmethodID GetStaticMethodID(JNIEnv* jni,
+                            jclass c,
+                            const char* name,
+                            const char* signature) {
+  jmethodID m = jni->GetStaticMethodID(c, name, signature);
+  CHECK_EXCEPTION(jni) << "Error during GetStaticMethodID: " << name << ", "
+                       << signature;
+  RTC_CHECK(m) << name << ", " << signature;
+  return m;
+}
+
+jclass FindClass(JNIEnv* jni, const char* name) {
+  jclass c = jni->FindClass(name);
+  CHECK_EXCEPTION(jni) << "Error during FindClass: " << name;
+  RTC_CHECK(c) << name;
+  return c;
+}
+
+jobject NewGlobalRef(JNIEnv* jni, jobject o) {
+  jobject ret = jni->NewGlobalRef(o);
+  CHECK_EXCEPTION(jni) << "Error during NewGlobalRef";
+  RTC_CHECK(ret);
+  return ret;
+}
+
+void DeleteGlobalRef(JNIEnv* jni, jobject o) {
+  jni->DeleteGlobalRef(o);
+  CHECK_EXCEPTION(jni) << "Error during DeleteGlobalRef";
+}
+
+AttachThreadScoped::AttachThreadScoped(JavaVM* jvm)
+    : attached_(false), jvm_(jvm), env_(NULL) {
+  env_ = GetEnv(jvm);
+  if (!env_) {
+    // Adding debug log here so we can track down potential leaks and figure
+    // out why we sometimes see "Native thread exiting without having called
+    // DetachCurrentThread" in logcat outputs.
+    ALOGD("Attaching thread to JVM[tid=%d]", rtc::CurrentThreadId());
+    jint res = jvm->AttachCurrentThread(&env_, NULL);
+    attached_ = (res == JNI_OK);
+    RTC_CHECK(attached_) << "AttachCurrentThread failed: " << res;
+  }
+}
+
+AttachThreadScoped::~AttachThreadScoped() {
+  if (attached_) {
+    ALOGD("Detaching thread from JVM[tid=%d]", rtc::CurrentThreadId());
+    jint res = jvm_->DetachCurrentThread();
+    RTC_CHECK(res == JNI_OK) << "DetachCurrentThread failed: " << res;
+    RTC_CHECK(!GetEnv(jvm_));
+  }
+}
+
+JNIEnv* AttachThreadScoped::env() {
+  return env_;
+}
+
+}  // namespace webrtc
diff --git a/third_party/libwebrtc/modules/utility/source/jvm_android.cc b/third_party/libwebrtc/modules/utility/source/jvm_android.cc
new file mode 100644
index 0000000000..39ef12f428
--- /dev/null
+++ b/third_party/libwebrtc/modules/utility/source/jvm_android.cc
@@ -0,0 +1,292 @@
+/*
+ *  Copyright (c) 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.
+ */
+
+#include "modules/utility/include/jvm_android.h"
+
+#include <android/log.h>
+
+#include <memory>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/platform_thread.h"
+
+namespace mozilla {
+namespace jni {
+jclass GetClassRef(JNIEnv* aEnv, const char* aClassName);
+}
+}
+
+#define TAG "JVM"
+#define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__)
+#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
+
+namespace webrtc {
+
+JVM* g_jvm;
+
+// TODO(henrika): add more clases here if needed.
+struct {
+  const char* name;
+  jclass clazz;
+} loaded_classes[] = {
+    {"org/webrtc/voiceengine/BuildInfo", nullptr},
+    {"org/webrtc/voiceengine/WebRtcAudioManager", nullptr},
+    {"org/webrtc/voiceengine/WebRtcAudioRecord", nullptr},
+    {"org/webrtc/voiceengine/WebRtcAudioTrack", nullptr},
+};
+
+// Android's FindClass() is trickier than usual because the app-specific
+// ClassLoader is not consulted when there is no app-specific frame on the
+// stack.  Consequently, we only look up all classes once in native WebRTC.
+// http://developer.android.com/training/articles/perf-jni.html#faq_FindClass
+void LoadClasses(JNIEnv* jni) {
+  RTC_LOG(LS_INFO) << "LoadClasses:";
+  for (auto& c : loaded_classes) {
+    ALOGD("name: %s", c.name);
+    jclass clsRef = mozilla::jni::GetClassRef(jni, c.name);
+    RTC_CHECK(clsRef) << c.name;
+    c.clazz = static_cast<jclass>(jni->NewGlobalRef(clsRef));
+    jni->DeleteLocalRef(clsRef);
+  }
+}
+
+void FreeClassReferences(JNIEnv* jni) {
+  for (auto& c : loaded_classes) {
+    jni->DeleteGlobalRef(c.clazz);
+    c.clazz = nullptr;
+  }
+}
+
+jclass LookUpClass(const char* name) {
+  for (auto& c : loaded_classes) {
+    if (strcmp(c.name, name) == 0)
+      return c.clazz;
+  }
+  RTC_CHECK(false) << "Unable to find class in lookup table";
+  return 0;
+}
+
+// JvmThreadConnector implementation.
+JvmThreadConnector::JvmThreadConnector() : attached_(false) {
+  RTC_LOG(LS_INFO) << "JvmThreadConnector::ctor";
+  JavaVM* jvm = JVM::GetInstance()->jvm();
+  RTC_CHECK(jvm);
+  JNIEnv* jni = GetEnv(jvm);
+  if (!jni) {
+    RTC_LOG(LS_INFO) << "Attaching thread to JVM";
+    JNIEnv* env = nullptr;
+    jint ret = jvm->AttachCurrentThread(&env, nullptr);
+    attached_ = (ret == JNI_OK);
+  }
+}
+
+JvmThreadConnector::~JvmThreadConnector() {
+  RTC_LOG(LS_INFO) << "JvmThreadConnector::dtor";
+  RTC_DCHECK(thread_checker_.IsCurrent());
+  if (attached_) {
+    RTC_LOG(LS_INFO) << "Detaching thread from JVM";
+    jint res = JVM::GetInstance()->jvm()->DetachCurrentThread();
+    RTC_CHECK(res == JNI_OK) << "DetachCurrentThread failed: " << res;
+  }
+}
+
+// GlobalRef implementation.
+GlobalRef::GlobalRef(JNIEnv* jni, jobject object)
+    : jni_(jni), j_object_(NewGlobalRef(jni, object)) {
+  RTC_LOG(LS_INFO) << "GlobalRef::ctor";
+}
+
+GlobalRef::~GlobalRef() {
+  RTC_LOG(LS_INFO) << "GlobalRef::dtor";
+  DeleteGlobalRef(jni_, j_object_);
+}
+
+jboolean GlobalRef::CallBooleanMethod(jmethodID methodID, ...) {
+  va_list args;
+  va_start(args, methodID);
+  jboolean res = jni_->CallBooleanMethodV(j_object_, methodID, args);
+  CHECK_EXCEPTION(jni_) << "Error during CallBooleanMethod";
+  va_end(args);
+  return res;
+}
+
+jint GlobalRef::CallIntMethod(jmethodID methodID, ...) {
+  va_list args;
+  va_start(args, methodID);
+  jint res = jni_->CallIntMethodV(j_object_, methodID, args);
+  CHECK_EXCEPTION(jni_) << "Error during CallIntMethod";
+  va_end(args);
+  return res;
+}
+
+void GlobalRef::CallVoidMethod(jmethodID methodID, ...) {
+  va_list args;
+  va_start(args, methodID);
+  jni_->CallVoidMethodV(j_object_, methodID, args);
+  CHECK_EXCEPTION(jni_) << "Error during CallVoidMethod";
+  va_end(args);
+}
+
+// NativeRegistration implementation.
+NativeRegistration::NativeRegistration(JNIEnv* jni, jclass clazz)
+    : JavaClass(jni, clazz), jni_(jni) {
+  RTC_LOG(LS_INFO) << "NativeRegistration::ctor";
+}
+
+NativeRegistration::~NativeRegistration() {
+  RTC_LOG(LS_INFO) << "NativeRegistration::dtor";
+  jni_->UnregisterNatives(j_class_);
+  CHECK_EXCEPTION(jni_) << "Error during UnregisterNatives";
+}
+
+std::unique_ptr<GlobalRef> NativeRegistration::NewObject(const char* name,
+                                                         const char* signature,
+                                                         ...) {
+  RTC_LOG(LS_INFO) << "NativeRegistration::NewObject";
+  va_list args;
+  va_start(args, signature);
+  jobject obj = jni_->NewObjectV(
+      j_class_, GetMethodID(jni_, j_class_, name, signature), args);
+  CHECK_EXCEPTION(jni_) << "Error during NewObjectV";
+  va_end(args);
+  return std::unique_ptr<GlobalRef>(new GlobalRef(jni_, obj));
+}
+
+// JavaClass implementation.
+jmethodID JavaClass::GetMethodId(const char* name, const char* signature) {
+  return GetMethodID(jni_, j_class_, name, signature);
+}
+
+jmethodID JavaClass::GetStaticMethodId(const char* name,
+                                       const char* signature) {
+  return GetStaticMethodID(jni_, j_class_, name, signature);
+}
+
+jobject JavaClass::CallStaticObjectMethod(jmethodID methodID, ...) {
+  va_list args;
+  va_start(args, methodID);
+  jobject res = jni_->CallStaticObjectMethodV(j_class_, methodID, args);
+  CHECK_EXCEPTION(jni_) << "Error during CallStaticObjectMethod";
+  return res;
+}
+
+jint JavaClass::CallStaticIntMethod(jmethodID methodID, ...) {
+  va_list args;
+  va_start(args, methodID);
+  jint res = jni_->CallStaticIntMethodV(j_class_, methodID, args);
+  CHECK_EXCEPTION(jni_) << "Error during CallStaticIntMethod";
+  return res;
+}
+
+// JNIEnvironment implementation.
+JNIEnvironment::JNIEnvironment(JNIEnv* jni) : jni_(jni) {
+  RTC_LOG(LS_INFO) << "JNIEnvironment::ctor";
+}
+
+JNIEnvironment::~JNIEnvironment() {
+  RTC_LOG(LS_INFO) << "JNIEnvironment::dtor";
+  RTC_DCHECK(thread_checker_.IsCurrent());
+}
+
+std::unique_ptr<NativeRegistration> JNIEnvironment::RegisterNatives(
+    const char* name,
+    const JNINativeMethod* methods,
+    int num_methods) {
+  RTC_LOG(LS_INFO) << "JNIEnvironment::RegisterNatives: " << name;
+  RTC_DCHECK(thread_checker_.IsCurrent());
+  jclass clazz = LookUpClass(name);
+  jni_->RegisterNatives(clazz, methods, num_methods);
+  CHECK_EXCEPTION(jni_) << "Error during RegisterNatives";
+  return std::unique_ptr<NativeRegistration>(
+      new NativeRegistration(jni_, clazz));
+}
+
+std::string JNIEnvironment::JavaToStdString(const jstring& j_string) {
+  RTC_DCHECK(thread_checker_.IsCurrent());
+  const char* jchars = jni_->GetStringUTFChars(j_string, nullptr);
+  CHECK_EXCEPTION(jni_);
+  const int size = jni_->GetStringUTFLength(j_string);
+  CHECK_EXCEPTION(jni_);
+  std::string ret(jchars, size);
+  jni_->ReleaseStringUTFChars(j_string, jchars);
+  CHECK_EXCEPTION(jni_);
+  return ret;
+}
+
+// static
+void JVM::Initialize(JavaVM* jvm) {
+  if (g_jvm) {
+    return;
+  }
+  g_jvm = new JVM(jvm);
+}
+
+void JVM::Initialize(JavaVM* jvm, jobject context) {
+  Initialize(jvm);
+
+  // Pass in the context to the new ContextUtils class.
+  JNIEnv* jni = g_jvm->jni();
+  jclass context_utils = FindClass(jni, "org/webrtc/ContextUtils");
+  jmethodID initialize_method = jni->GetStaticMethodID(
+      context_utils, "initialize", "(Landroid/content/Context;)V");
+  jni->CallStaticVoidMethod(context_utils, initialize_method, context);
+}
+
+// static
+void JVM::Uninitialize() {
+  RTC_LOG(LS_INFO) << "JVM::Uninitialize";
+  RTC_DCHECK(g_jvm);
+  delete g_jvm;
+  g_jvm = nullptr;
+}
+
+// static
+JVM* JVM::GetInstance() {
+  RTC_DCHECK(g_jvm);
+  return g_jvm;
+}
+
+JVM::JVM(JavaVM* jvm) : jvm_(jvm) {
+  RTC_LOG(LS_INFO) << "JVM::JVM";
+  RTC_CHECK(jni()) << "AttachCurrentThread() must be called on this thread.";
+  LoadClasses(jni());
+}
+
+JVM::~JVM() {
+  RTC_LOG(LS_INFO) << "JVM::~JVM";
+  RTC_DCHECK(thread_checker_.IsCurrent());
+  FreeClassReferences(jni());
+}
+
+std::unique_ptr<JNIEnvironment> JVM::environment() {
+  RTC_LOG(LS_INFO) << "JVM::environment";
+  ;
+  // The JNIEnv is used for thread-local storage. For this reason, we cannot
+  // share a JNIEnv between threads. If a piece of code has no other way to get
+  // its JNIEnv, we should share the JavaVM, and use GetEnv to discover the
+  // thread's JNIEnv. (Assuming it has one, if not, use AttachCurrentThread).
+  // See // http://developer.android.com/training/articles/perf-jni.html.
+  JNIEnv* jni = GetEnv(jvm_);
+  if (!jni) {
+    RTC_LOG(LS_ERROR)
+        << "AttachCurrentThread() has not been called on this thread";
+    return std::unique_ptr<JNIEnvironment>();
+  }
+  return std::unique_ptr<JNIEnvironment>(new JNIEnvironment(jni));
+}
+
+JavaClass JVM::GetClass(const char* name) {
+  RTC_LOG(LS_INFO) << "JVM::GetClass: " << name;
+  RTC_DCHECK(thread_checker_.IsCurrent());
+  return JavaClass(jni(), LookUpClass(name));
+}
+
+}  // namespace webrtc