| 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 2810 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2821 // Channel ID, disassociate with it. | 2821 // Channel ID, disassociate with it. |
| 2822 ChannelOwner ref(NULL); | 2822 ChannelOwner ref(NULL); |
| 2823 associate_send_channel_ = ref; | 2823 associate_send_channel_ = ref; |
| 2824 } | 2824 } |
| 2825 } | 2825 } |
| 2826 | 2826 |
| 2827 void Channel::SetRtcEventLog(RtcEventLog* event_log) { | 2827 void Channel::SetRtcEventLog(RtcEventLog* event_log) { |
| 2828 event_log_proxy_->SetEventLog(event_log); | 2828 event_log_proxy_->SetEventLog(event_log); |
| 2829 } | 2829 } |
| 2830 | 2830 |
| 2831 void Channel::SetTransportOverhead(int transport_overhead_per_packet) { |
| 2832 _rtpRtcpModule->SetTransportOverhead(transport_overhead_per_packet); |
| 2833 } |
| 2834 |
| 2831 int Channel::RegisterExternalMediaProcessing(ProcessingTypes type, | 2835 int Channel::RegisterExternalMediaProcessing(ProcessingTypes type, |
| 2832 VoEMediaProcess& processObject) { | 2836 VoEMediaProcess& processObject) { |
| 2833 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId), | 2837 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId), |
| 2834 "Channel::RegisterExternalMediaProcessing()"); | 2838 "Channel::RegisterExternalMediaProcessing()"); |
| 2835 | 2839 |
| 2836 rtc::CritScope cs(&_callbackCritSect); | 2840 rtc::CritScope cs(&_callbackCritSect); |
| 2837 | 2841 |
| 2838 if (kPlaybackPerChannel == type) { | 2842 if (kPlaybackPerChannel == type) { |
| 2839 if (_outputExternalMediaCallbackPtr) { | 2843 if (_outputExternalMediaCallbackPtr) { |
| 2840 _engineStatisticsPtr->SetLastError( | 2844 _engineStatisticsPtr->SetLastError( |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3228 int64_t min_rtt = 0; | 3232 int64_t min_rtt = 0; |
| 3229 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != | 3233 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != |
| 3230 0) { | 3234 0) { |
| 3231 return 0; | 3235 return 0; |
| 3232 } | 3236 } |
| 3233 return rtt; | 3237 return rtt; |
| 3234 } | 3238 } |
| 3235 | 3239 |
| 3236 } // namespace voe | 3240 } // namespace voe |
| 3237 } // namespace webrtc | 3241 } // namespace webrtc |
| OLD | NEW |