| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 case kRecordingAllChannelsMixed: | 117 case kRecordingAllChannelsMixed: |
| 118 case kRecordingPreprocessing: { | 118 case kRecordingPreprocessing: { |
| 119 return shared_->transmit_mixer()->DeRegisterExternalMediaProcessing(type); | 119 return shared_->transmit_mixer()->DeRegisterExternalMediaProcessing(type); |
| 120 } | 120 } |
| 121 } | 121 } |
| 122 return -1; | 122 return -1; |
| 123 } | 123 } |
| 124 | 124 |
| 125 int VoEExternalMediaImpl::GetAudioFrame(int channel, int desired_sample_rate_hz, | 125 int VoEExternalMediaImpl::GetAudioFrame(int channel, int desired_sample_rate_hz, |
| 126 AudioFrame* frame) { | 126 AudioFrame* frame) { |
| 127 WEBRTC_TRACE(kTraceApiCall, kTraceVoice, | |
| 128 VoEId(shared_->instance_id(), channel), | |
| 129 "GetAudioFrame(channel=%d, desired_sample_rate_hz=%d)", channel, | |
| 130 desired_sample_rate_hz); | |
| 131 if (!shared_->statistics().Initialized()) { | 127 if (!shared_->statistics().Initialized()) { |
| 132 shared_->SetLastError(VE_NOT_INITED, kTraceError); | 128 shared_->SetLastError(VE_NOT_INITED, kTraceError); |
| 133 return -1; | 129 return -1; |
| 134 } | 130 } |
| 135 voe::ChannelOwner ch = shared_->channel_manager().GetChannel(channel); | 131 voe::ChannelOwner ch = shared_->channel_manager().GetChannel(channel); |
| 136 voe::Channel* channelPtr = ch.channel(); | 132 voe::Channel* channelPtr = ch.channel(); |
| 137 if (channelPtr == NULL) { | 133 if (channelPtr == NULL) { |
| 138 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 134 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 139 "GetAudioFrame() failed to locate channel"); | 135 "GetAudioFrame() failed to locate channel"); |
| 140 return -1; | 136 return -1; |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 171 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 176 "SetExternalMixing() failed to locate channel"); | 172 "SetExternalMixing() failed to locate channel"); |
| 177 return -1; | 173 return -1; |
| 178 } | 174 } |
| 179 return channelPtr->SetExternalMixing(enable); | 175 return channelPtr->SetExternalMixing(enable); |
| 180 } | 176 } |
| 181 | 177 |
| 182 #endif // WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API | 178 #endif // WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API |
| 183 | 179 |
| 184 } // namespace webrtc | 180 } // namespace webrtc |
| OLD | NEW |