OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 #include "webrtc/modules/audio_device/android/ensure_initialized.h" | 11 #include "webrtc/modules/audio_device/android/ensure_initialized.h" |
12 | 12 |
13 #include <pthread.h> | 13 #include <pthread.h> |
14 | 14 |
15 #include "webrtc/base/ignore_wundef.h" | 15 #include "webrtc/base/ignore_wundef.h" |
16 | 16 |
17 // Note: this dependency is dangerous since it reaches into Chromium's base. | 17 // Note: this dependency is dangerous since it reaches into Chromium's base. |
18 // There's a risk of e.g. macro clashes. This file may only be used in tests. | 18 // There's a risk of e.g. macro clashes. This file may only be used in tests. |
19 RTC_PUSH_IGNORING_WUNDEF() | 19 RTC_PUSH_IGNORING_WUNDEF() |
20 // #include "base/android/context_utils.h" | 20 #include "base/android/context_utils.h" |
21 #include "base/android/jni_android.h" | 21 #include "base/android/jni_android.h" |
22 RTC_POP_IGNORING_WUNDEF() | 22 RTC_POP_IGNORING_WUNDEF() |
23 #include "webrtc/base/checks.h" | 23 #include "webrtc/base/checks.h" |
24 #include "webrtc/modules/audio_device/android/audio_record_jni.h" | 24 #include "webrtc/modules/audio_device/android/audio_record_jni.h" |
25 #include "webrtc/modules/audio_device/android/audio_track_jni.h" | 25 #include "webrtc/modules/audio_device/android/audio_track_jni.h" |
26 #include "webrtc/modules/utility/include/jvm_android.h" | 26 #include "webrtc/modules/utility/include/jvm_android.h" |
27 | 27 |
28 namespace webrtc { | 28 namespace webrtc { |
29 namespace audiodevicemodule { | 29 namespace audiodevicemodule { |
30 | 30 |
31 static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT; | 31 static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT; |
32 | 32 |
33 void EnsureInitializedOnce() { | 33 void EnsureInitializedOnce() { |
34 RTC_CHECK(::base::android::IsVMInitialized()); | 34 RTC_CHECK(::base::android::IsVMInitialized()); |
35 JNIEnv* jni = ::base::android::AttachCurrentThread(); | 35 JNIEnv* jni = ::base::android::AttachCurrentThread(); |
36 JavaVM* jvm = NULL; | 36 JavaVM* jvm = NULL; |
37 RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm)); | 37 RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm)); |
| 38 jobject context = ::base::android::GetApplicationContext().obj(); |
38 | 39 |
39 // Initialize the Java environment (currently only used by the audio manager). | 40 // Initialize the Java environment (currently only used by the audio manager). |
40 webrtc::JVM::Initialize(jvm); | 41 webrtc::JVM::Initialize(jvm, context); |
41 } | 42 } |
42 | 43 |
43 void EnsureInitialized() { | 44 void EnsureInitialized() { |
44 RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce)); | 45 RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce)); |
45 } | 46 } |
46 | 47 |
47 } // namespace audiodevicemodule | 48 } // namespace audiodevicemodule |
48 } // namespace webrtc | 49 } // namespace webrtc |
OLD | NEW |