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 |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 _externalMedia(false), | 101 _externalMedia(false), |
102 _panLeft(1.0f), | 102 _panLeft(1.0f), |
103 _panRight(1.0f), | 103 _panRight(1.0f), |
104 _mixingFrequencyHz(8000), | 104 _mixingFrequencyHz(8000), |
105 _outputFileRecorderPtr(NULL), | 105 _outputFileRecorderPtr(NULL), |
106 _outputFileRecording(false) | 106 _outputFileRecording(false) |
107 { | 107 { |
108 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId,-1), | 108 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId,-1), |
109 "OutputMixer::OutputMixer() - ctor"); | 109 "OutputMixer::OutputMixer() - ctor"); |
110 | 110 |
111 if (_mixerModule.RegisterMixedStreamCallback(*this) == -1) | 111 if (_mixerModule.RegisterMixedStreamCallback(this) == -1) |
112 { | 112 { |
113 WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId,-1), | 113 WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId,-1), |
114 "OutputMixer::OutputMixer() failed to register mixer" | 114 "OutputMixer::OutputMixer() failed to register mixer" |
115 "callbacks"); | 115 "callbacks"); |
116 } | 116 } |
117 | 117 |
118 _dtmfGenerator.Init(); | 118 _dtmfGenerator.Init(); |
119 } | 119 } |
120 | 120 |
121 void | 121 void |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 "OutputMixer::PlayDtmfTone()"); | 208 "OutputMixer::PlayDtmfTone()"); |
209 return -1; | 209 return -1; |
210 } | 210 } |
211 return 0; | 211 return 0; |
212 } | 212 } |
213 | 213 |
214 int32_t | 214 int32_t |
215 OutputMixer::SetMixabilityStatus(MixerParticipant& participant, | 215 OutputMixer::SetMixabilityStatus(MixerParticipant& participant, |
216 bool mixable) | 216 bool mixable) |
217 { | 217 { |
218 return _mixerModule.SetMixabilityStatus(participant, mixable); | 218 return _mixerModule.SetMixabilityStatus(&participant, mixable); |
219 } | 219 } |
220 | 220 |
221 int32_t | 221 int32_t |
222 OutputMixer::SetAnonymousMixabilityStatus(MixerParticipant& participant, | 222 OutputMixer::SetAnonymousMixabilityStatus(MixerParticipant& participant, |
223 bool mixable) | 223 bool mixable) |
224 { | 224 { |
225 return _mixerModule.SetAnonymousMixabilityStatus(participant,mixable); | 225 return _mixerModule.SetAnonymousMixabilityStatus(&participant, mixable); |
226 } | 226 } |
227 | 227 |
228 int32_t | 228 int32_t |
229 OutputMixer::MixActiveChannels() | 229 OutputMixer::MixActiveChannels() |
230 { | 230 { |
231 return _mixerModule.Process(); | 231 return _mixerModule.Process(); |
232 } | 232 } |
233 | 233 |
234 int | 234 int |
235 OutputMixer::GetSpeechOutputLevel(uint32_t& level) | 235 OutputMixer::GetSpeechOutputLevel(uint32_t& level) |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
595 _audioFrame.data_[2 * i + 1] = 0; | 595 _audioFrame.data_[2 * i + 1] = 0; |
596 } | 596 } |
597 } | 597 } |
598 assert(_audioFrame.samples_per_channel_ == toneSamples); | 598 assert(_audioFrame.samples_per_channel_ == toneSamples); |
599 | 599 |
600 return 0; | 600 return 0; |
601 } | 601 } |
602 | 602 |
603 } // namespace voe | 603 } // namespace voe |
604 } // namespace webrtc | 604 } // namespace webrtc |
OLD | NEW |