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

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

Issue 2681033010: Remove usage of VoEAudioProcessing from WVoE/MC. (Closed)
Patch Set: one more Created 3 years, 10 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/transmit_mixer.h ('k') | webrtc/voice_engine/voe_base_impl.h » ('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
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 TransmitMixer::Destroy(TransmitMixer*& mixer) 169 TransmitMixer::Destroy(TransmitMixer*& mixer)
170 { 170 {
171 if (mixer) 171 if (mixer)
172 { 172 {
173 delete mixer; 173 delete mixer;
174 mixer = NULL; 174 mixer = NULL;
175 } 175 }
176 } 176 }
177 177
178 TransmitMixer::TransmitMixer(uint32_t instanceId) : 178 TransmitMixer::TransmitMixer(uint32_t instanceId) :
179 _engineStatisticsPtr(NULL),
180 _channelManagerPtr(NULL),
181 audioproc_(NULL),
182 _voiceEngineObserverPtr(NULL),
183 _processThreadPtr(NULL),
184 // Avoid conflict with other channels by adding 1024 - 1026, 179 // Avoid conflict with other channels by adding 1024 - 1026,
185 // won't use as much as 1024 channels. 180 // won't use as much as 1024 channels.
186 _filePlayerId(instanceId + 1024), 181 _filePlayerId(instanceId + 1024),
187 _fileRecorderId(instanceId + 1025), 182 _fileRecorderId(instanceId + 1025),
188 _fileCallRecorderId(instanceId + 1026), 183 _fileCallRecorderId(instanceId + 1026),
189 _filePlaying(false), 184 _instanceId(instanceId)
190 _fileRecording(false),
191 _fileCallRecording(false),
192 _audioLevel(),
193 #if WEBRTC_VOICE_ENGINE_TYPING_DETECTION
194 _typingNoiseWarningPending(false),
195 _typingNoiseDetected(false),
196 #endif
197 _saturationWarning(false),
198 _instanceId(instanceId),
199 _mixFileWithMicrophone(false),
200 _captureLevel(0),
201 _mute(false),
202 stereo_codec_(false),
203 swap_stereo_channels_(false)
204 { 185 {
205 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, -1), 186 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, -1),
206 "TransmitMixer::TransmitMixer() - ctor"); 187 "TransmitMixer::TransmitMixer() - ctor");
207 } 188 }
208 189
209 TransmitMixer::~TransmitMixer() 190 TransmitMixer::~TransmitMixer()
210 { 191 {
211 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, -1), 192 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, -1),
212 "TransmitMixer::~TransmitMixer() - dtor"); 193 "TransmitMixer::~TransmitMixer() - dtor");
213 _monitorModule.DeRegisterObserver(); 194 _monitorModule.DeRegisterObserver();
(...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 void TransmitMixer::EnableStereoChannelSwapping(bool enable) { 1139 void TransmitMixer::EnableStereoChannelSwapping(bool enable) {
1159 swap_stereo_channels_ = enable; 1140 swap_stereo_channels_ = enable;
1160 } 1141 }
1161 1142
1162 bool TransmitMixer::IsStereoChannelSwappingEnabled() { 1143 bool TransmitMixer::IsStereoChannelSwappingEnabled() {
1163 return swap_stereo_channels_; 1144 return swap_stereo_channels_;
1164 } 1145 }
1165 1146
1166 } // namespace voe 1147 } // namespace voe
1167 } // namespace webrtc 1148 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/transmit_mixer.h ('k') | webrtc/voice_engine/voe_base_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698