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

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

Issue 2729053002: Add location to RegisterModule (Closed)
Patch Set: Format BUILD.gn Created 3 years, 9 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/channel.cc ('k') | webrtc/voice_engine/voe_base_impl.cc » ('j') | 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 #include "webrtc/voice_engine/transmit_mixer.h" 11 #include "webrtc/voice_engine/transmit_mixer.h"
12 12
13 #include <memory> 13 #include <memory>
14 14
15 #include "webrtc/audio/utility/audio_frame_operations.h" 15 #include "webrtc/audio/utility/audio_frame_operations.h"
16 #include "webrtc/base/format_macros.h" 16 #include "webrtc/base/format_macros.h"
17 #include "webrtc/base/location.h"
17 #include "webrtc/base/logging.h" 18 #include "webrtc/base/logging.h"
18 #include "webrtc/system_wrappers/include/event_wrapper.h" 19 #include "webrtc/system_wrappers/include/event_wrapper.h"
19 #include "webrtc/system_wrappers/include/trace.h" 20 #include "webrtc/system_wrappers/include/trace.h"
20 #include "webrtc/voice_engine/channel.h" 21 #include "webrtc/voice_engine/channel.h"
21 #include "webrtc/voice_engine/channel_manager.h" 22 #include "webrtc/voice_engine/channel_manager.h"
22 #include "webrtc/voice_engine/statistics.h" 23 #include "webrtc/voice_engine/statistics.h"
23 #include "webrtc/voice_engine/utility.h" 24 #include "webrtc/voice_engine/utility.h"
24 #include "webrtc/voice_engine/voe_base_impl.h" 25 #include "webrtc/voice_engine/voe_base_impl.h"
25 26
26 namespace webrtc { 27 namespace webrtc {
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 ChannelManager& channelManager) 197 ChannelManager& channelManager)
197 { 198 {
198 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1), 199 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1),
199 "TransmitMixer::SetEngineInformation()"); 200 "TransmitMixer::SetEngineInformation()");
200 201
201 _processThreadPtr = &processThread; 202 _processThreadPtr = &processThread;
202 _engineStatisticsPtr = &engineStatistics; 203 _engineStatisticsPtr = &engineStatistics;
203 _channelManagerPtr = &channelManager; 204 _channelManagerPtr = &channelManager;
204 205
205 #if WEBRTC_VOICE_ENGINE_TYPING_DETECTION 206 #if WEBRTC_VOICE_ENGINE_TYPING_DETECTION
206 _processThreadPtr->RegisterModule(&_monitorModule); 207 _processThreadPtr->RegisterModule(&_monitorModule, RTC_FROM_HERE);
207 #endif 208 #endif
208 return 0; 209 return 0;
209 } 210 }
210 211
211 int32_t 212 int32_t
212 TransmitMixer::RegisterVoiceEngineObserver(VoiceEngineObserver& observer) 213 TransmitMixer::RegisterVoiceEngineObserver(VoiceEngineObserver& observer)
213 { 214 {
214 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1), 215 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1),
215 "TransmitMixer::RegisterVoiceEngineObserver()"); 216 "TransmitMixer::RegisterVoiceEngineObserver()");
216 rtc::CritScope cs(&_callbackCritSect); 217 rtc::CritScope cs(&_callbackCritSect);
(...skipping 895 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 void TransmitMixer::EnableStereoChannelSwapping(bool enable) { 1113 void TransmitMixer::EnableStereoChannelSwapping(bool enable) {
1113 swap_stereo_channels_ = enable; 1114 swap_stereo_channels_ = enable;
1114 } 1115 }
1115 1116
1116 bool TransmitMixer::IsStereoChannelSwappingEnabled() { 1117 bool TransmitMixer::IsStereoChannelSwappingEnabled() {
1117 return swap_stereo_channels_; 1118 return swap_stereo_channels_;
1118 } 1119 }
1119 1120
1120 } // namespace voe 1121 } // namespace voe
1121 } // namespace webrtc 1122 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/voe_base_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698