| 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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 int32_t | 217 int32_t |
| 218 OutputMixer::SetAnonymousMixabilityStatus(MixerParticipant& participant, | 218 OutputMixer::SetAnonymousMixabilityStatus(MixerParticipant& participant, |
| 219 bool mixable) | 219 bool mixable) |
| 220 { | 220 { |
| 221 return _mixerModule.SetAnonymousMixabilityStatus(&participant, mixable); | 221 return _mixerModule.SetAnonymousMixabilityStatus(&participant, mixable); |
| 222 } | 222 } |
| 223 | 223 |
| 224 int32_t | 224 int32_t |
| 225 OutputMixer::MixActiveChannels() | 225 OutputMixer::MixActiveChannels() |
| 226 { | 226 { |
| 227 _mixerModule.Process(); | 227 return _mixerModule.Process(); |
| 228 return 0; | |
| 229 } | 228 } |
| 230 | 229 |
| 231 int | 230 int |
| 232 OutputMixer::GetSpeechOutputLevel(uint32_t& level) | 231 OutputMixer::GetSpeechOutputLevel(uint32_t& level) |
| 233 { | 232 { |
| 234 int8_t currentLevel = _audioLevel.Level(); | 233 int8_t currentLevel = _audioLevel.Level(); |
| 235 level = static_cast<uint32_t> (currentLevel); | 234 level = static_cast<uint32_t> (currentLevel); |
| 236 WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_instanceId,-1), | 235 WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_instanceId,-1), |
| 237 "GetSpeechOutputLevel() => level=%u", level); | 236 "GetSpeechOutputLevel() => level=%u", level); |
| 238 return 0; | 237 return 0; |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 598 _audioFrame.data_[2 * i + 1] = 0; | 597 _audioFrame.data_[2 * i + 1] = 0; |
| 599 } | 598 } |
| 600 } | 599 } |
| 601 assert(_audioFrame.samples_per_channel_ == toneSamples); | 600 assert(_audioFrame.samples_per_channel_ == toneSamples); |
| 602 | 601 |
| 603 return 0; | 602 return 0; |
| 604 } | 603 } |
| 605 | 604 |
| 606 } // namespace voe | 605 } // namespace voe |
| 607 } // namespace webrtc | 606 } // namespace webrtc |
| OLD | NEW |