OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 #if defined(WEBRTC_ANDROID) | 11 #if defined(WEBRTC_ANDROID) |
12 #include "webrtc/modules/audio_device/android/audio_device_template.h" | 12 #include "webrtc/modules/audio_device/android/audio_device_template.h" |
13 #include "webrtc/modules/audio_device/android/audio_record_jni.h" | 13 #include "webrtc/modules/audio_device/android/audio_record_jni.h" |
14 #include "webrtc/modules/audio_device/android/audio_track_jni.h" | 14 #include "webrtc/modules/audio_device/android/audio_track_jni.h" |
15 #include "webrtc/modules/utility/include/jvm_android.h" | 15 #include "webrtc/modules/utility/include/jvm_android.h" |
16 #endif | 16 #endif |
17 | 17 |
18 #include "webrtc/base/checks.h" | 18 #include "webrtc/base/checks.h" |
19 #include "webrtc/modules/audio_coding/main/include/audio_coding_module.h" | 19 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" |
20 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" | 20 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
21 #include "webrtc/system_wrappers/include/trace.h" | 21 #include "webrtc/system_wrappers/include/trace.h" |
22 #include "webrtc/voice_engine/channel_proxy.h" | 22 #include "webrtc/voice_engine/channel_proxy.h" |
23 #include "webrtc/voice_engine/voice_engine_impl.h" | 23 #include "webrtc/voice_engine/voice_engine_impl.h" |
24 | 24 |
25 namespace webrtc { | 25 namespace webrtc { |
26 | 26 |
27 // Counter to be ensure that we can add a correct ID in all static trace | 27 // Counter to be ensure that we can add a correct ID in all static trace |
28 // methods. It is not the nicest solution, especially not since we already | 28 // methods. It is not the nicest solution, especially not since we already |
29 // have a counter in VoEBaseImpl. In other words, there is room for | 29 // have a counter in VoEBaseImpl. In other words, there is room for |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 webrtc::JVM::Initialize(reinterpret_cast<JavaVM*>(javaVM), | 159 webrtc::JVM::Initialize(reinterpret_cast<JavaVM*>(javaVM), |
160 reinterpret_cast<jobject>(context)); | 160 reinterpret_cast<jobject>(context)); |
161 return 0; | 161 return 0; |
162 #else | 162 #else |
163 return -1; | 163 return -1; |
164 #endif | 164 #endif |
165 } | 165 } |
166 #endif | 166 #endif |
167 | 167 |
168 } // namespace webrtc | 168 } // namespace webrtc |
OLD | NEW |