Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(692)

Side by Side Diff: webrtc/modules/audio_device/android/ensure_initialized.cc

Issue 1417683006: modules: more interface -> include renames (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix last incorrectly wrapped pragma message Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 // Note: this dependency is dangerous since it reaches into Chromium's base. 15 // Note: this dependency is dangerous since it reaches into Chromium's base.
16 // There's a risk of e.g. macro clashes. This file may only be used in tests. 16 // There's a risk of e.g. macro clashes. This file may only be used in tests.
17 #include "base/android/jni_android.h" 17 #include "base/android/jni_android.h"
18 #include "webrtc/base/checks.h" 18 #include "webrtc/base/checks.h"
19 #include "webrtc/modules/audio_device/android/audio_record_jni.h" 19 #include "webrtc/modules/audio_device/android/audio_record_jni.h"
20 #include "webrtc/modules/audio_device/android/audio_track_jni.h" 20 #include "webrtc/modules/audio_device/android/audio_track_jni.h"
21 #include "webrtc/modules/utility/interface/jvm_android.h" 21 #include "webrtc/modules/utility/include/jvm_android.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 namespace audiodevicemodule { 24 namespace audiodevicemodule {
25 25
26 static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT; 26 static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT;
27 27
28 void EnsureInitializedOnce() { 28 void EnsureInitializedOnce() {
29 RTC_CHECK(::base::android::IsVMInitialized()); 29 RTC_CHECK(::base::android::IsVMInitialized());
30 JNIEnv* jni = ::base::android::AttachCurrentThread(); 30 JNIEnv* jni = ::base::android::AttachCurrentThread();
31 JavaVM* jvm = NULL; 31 JavaVM* jvm = NULL;
32 RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm)); 32 RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm));
33 jobject context = ::base::android::GetApplicationContext(); 33 jobject context = ::base::android::GetApplicationContext();
34 34
35 // Initialize the Java environment (currently only used by the audio manager). 35 // Initialize the Java environment (currently only used by the audio manager).
36 webrtc::JVM::Initialize(jvm, context); 36 webrtc::JVM::Initialize(jvm, context);
37 } 37 }
38 38
39 void EnsureInitialized() { 39 void EnsureInitialized() {
40 RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce)); 40 RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce));
41 } 41 }
42 42
43 } // namespace audiodevicemodule 43 } // namespace audiodevicemodule
44 } // namespace webrtc 44 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/android/build_info.cc ('k') | webrtc/modules/audio_device/android/opensles_player.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698