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

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

Issue 2681033010: Remove usage of VoEAudioProcessing from WVoE/MC. (Closed)
Patch Set: remove 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
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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 TransmitMixer::Destroy(TransmitMixer*& mixer) 170 TransmitMixer::Destroy(TransmitMixer*& mixer)
171 { 171 {
172 if (mixer) 172 if (mixer)
173 { 173 {
174 delete mixer; 174 delete mixer;
175 mixer = NULL; 175 mixer = NULL;
176 } 176 }
177 } 177 }
178 178
179 TransmitMixer::TransmitMixer(uint32_t instanceId) : 179 TransmitMixer::TransmitMixer(uint32_t instanceId) :
180 _engineStatisticsPtr(NULL),
181 _channelManagerPtr(NULL),
182 audioproc_(NULL),
183 _voiceEngineObserverPtr(NULL),
184 _processThreadPtr(NULL),
185 // Avoid conflict with other channels by adding 1024 - 1026, 180 // Avoid conflict with other channels by adding 1024 - 1026,
186 // won't use as much as 1024 channels. 181 // won't use as much as 1024 channels.
187 _filePlayerId(instanceId + 1024), 182 _filePlayerId(instanceId + 1024),
188 _fileRecorderId(instanceId + 1025), 183 _fileRecorderId(instanceId + 1025),
189 _fileCallRecorderId(instanceId + 1026), 184 _fileCallRecorderId(instanceId + 1026),
190 _filePlaying(false), 185 _instanceId(instanceId)
191 _fileRecording(false),
192 _fileCallRecording(false),
193 _audioLevel(),
194 #if WEBRTC_VOICE_ENGINE_TYPING_DETECTION
195 _typingNoiseWarningPending(false),
196 _typingNoiseDetected(false),
197 #endif
198 _saturationWarning(false),
199 _instanceId(instanceId),
200 _mixFileWithMicrophone(false),
201 _captureLevel(0),
202 external_postproc_ptr_(NULL),
203 external_preproc_ptr_(NULL),
204 _mute(false),
205 stereo_codec_(false),
206 swap_stereo_channels_(false)
207 { 186 {
208 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, -1), 187 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, -1),
209 "TransmitMixer::TransmitMixer() - ctor"); 188 "TransmitMixer::TransmitMixer() - ctor");
210 } 189 }
211 190
212 TransmitMixer::~TransmitMixer() 191 TransmitMixer::~TransmitMixer()
213 { 192 {
214 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, -1), 193 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, -1),
215 "TransmitMixer::~TransmitMixer() - dtor"); 194 "TransmitMixer::~TransmitMixer() - dtor");
216 _monitorModule.DeRegisterObserver(); 195 _monitorModule.DeRegisterObserver();
(...skipping 1011 matching lines...) Expand 10 before | Expand all | Expand 10 after
1228 void TransmitMixer::EnableStereoChannelSwapping(bool enable) { 1207 void TransmitMixer::EnableStereoChannelSwapping(bool enable) {
1229 swap_stereo_channels_ = enable; 1208 swap_stereo_channels_ = enable;
1230 } 1209 }
1231 1210
1232 bool TransmitMixer::IsStereoChannelSwappingEnabled() { 1211 bool TransmitMixer::IsStereoChannelSwappingEnabled() {
1233 return swap_stereo_channels_; 1212 return swap_stereo_channels_;
1234 } 1213 }
1235 1214
1236 } // namespace voe 1215 } // namespace voe
1237 } // namespace webrtc 1216 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698