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

Side by Side Diff: webrtc/voice_engine/voice_engine_impl.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 months 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
« no previous file with comments | « webrtc/voice_engine/voe_network_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #endif 15 #endif
16 16
17 #include "webrtc/base/checks.h"
18 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" 17 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
18 #include "webrtc/rtc_base/checks.h"
19 #include "webrtc/system_wrappers/include/trace.h" 19 #include "webrtc/system_wrappers/include/trace.h"
20 #include "webrtc/voice_engine/channel_proxy.h" 20 #include "webrtc/voice_engine/channel_proxy.h"
21 #include "webrtc/voice_engine/voice_engine_impl.h" 21 #include "webrtc/voice_engine/voice_engine_impl.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 // Counter to be ensure that we can add a correct ID in all static trace 25 // Counter to be ensure that we can add a correct ID in all static trace
26 // methods. It is not the nicest solution, especially not since we already 26 // methods. It is not the nicest solution, especially not since we already
27 // have a counter in VoEBaseImpl. In other words, there is room for 27 // have a counter in VoEBaseImpl. In other words, there is room for
28 // improvement here. 28 // improvement here.
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 std::string VoiceEngine::GetVersionString() { 131 std::string VoiceEngine::GetVersionString() {
132 std::string version = "VoiceEngine 4.1.0"; 132 std::string version = "VoiceEngine 4.1.0";
133 #ifdef WEBRTC_EXTERNAL_TRANSPORT 133 #ifdef WEBRTC_EXTERNAL_TRANSPORT
134 version += " (External transport build)"; 134 version += " (External transport build)";
135 #endif 135 #endif
136 return version; 136 return version;
137 } 137 }
138 138
139 } // namespace webrtc 139 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/voe_network_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698