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/jvm_android.h" |
13 #include "webrtc/modules/audio_device/android/audio_record_jni.h" | |
henrika_webrtc
2016/11/25 12:12:11
Nice ;-)
| |
14 #include "webrtc/modules/audio_device/android/audio_track_jni.h" | |
15 #include "webrtc/modules/utility/include/jvm_android.h" | |
16 #endif | 13 #endif |
17 | 14 |
18 #include "webrtc/base/checks.h" | 15 #include "webrtc/base/checks.h" |
19 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" | 16 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" |
20 #include "webrtc/system_wrappers/include/trace.h" | 17 #include "webrtc/system_wrappers/include/trace.h" |
21 #include "webrtc/voice_engine/channel_proxy.h" | 18 #include "webrtc/voice_engine/channel_proxy.h" |
22 #include "webrtc/voice_engine/voice_engine_impl.h" | 19 #include "webrtc/voice_engine/voice_engine_impl.h" |
23 | 20 |
24 namespace webrtc { | 21 namespace webrtc { |
25 | 22 |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
144 | 141 |
145 std::string VoiceEngine::GetVersionString() { | 142 std::string VoiceEngine::GetVersionString() { |
146 std::string version = "VoiceEngine 4.1.0"; | 143 std::string version = "VoiceEngine 4.1.0"; |
147 #ifdef WEBRTC_EXTERNAL_TRANSPORT | 144 #ifdef WEBRTC_EXTERNAL_TRANSPORT |
148 version += " (External transport build)"; | 145 version += " (External transport build)"; |
149 #endif | 146 #endif |
150 return version; | 147 return version; |
151 } | 148 } |
152 | 149 |
153 } // namespace webrtc | 150 } // namespace webrtc |
OLD | NEW |