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 2826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2837 // Channel ID, disassociate with it. | 2837 // Channel ID, disassociate with it. |
2838 ChannelOwner ref(NULL); | 2838 ChannelOwner ref(NULL); |
2839 associate_send_channel_ = ref; | 2839 associate_send_channel_ = ref; |
2840 } | 2840 } |
2841 } | 2841 } |
2842 | 2842 |
2843 void Channel::SetRtcEventLog(RtcEventLog* event_log) { | 2843 void Channel::SetRtcEventLog(RtcEventLog* event_log) { |
2844 event_log_proxy_->SetEventLog(event_log); | 2844 event_log_proxy_->SetEventLog(event_log); |
2845 } | 2845 } |
2846 | 2846 |
2847 void Channel::SetTransportOverhead(int transport_overhead_per_packet_byte) { | |
2848 _rtpRtcpModule->SetTransportOverhead(transport_overhead_per_packet_byte); | |
the sun
2016/10/20 08:56:46
Either remove the return value of RtpRtcp::SetTran
michaelt
2016/10/20 09:38:05
I remove the return value of the function.
| |
2849 } | |
2850 | |
2847 int Channel::RegisterExternalMediaProcessing(ProcessingTypes type, | 2851 int Channel::RegisterExternalMediaProcessing(ProcessingTypes type, |
2848 VoEMediaProcess& processObject) { | 2852 VoEMediaProcess& processObject) { |
2849 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId), | 2853 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId), |
2850 "Channel::RegisterExternalMediaProcessing()"); | 2854 "Channel::RegisterExternalMediaProcessing()"); |
2851 | 2855 |
2852 rtc::CritScope cs(&_callbackCritSect); | 2856 rtc::CritScope cs(&_callbackCritSect); |
2853 | 2857 |
2854 if (kPlaybackPerChannel == type) { | 2858 if (kPlaybackPerChannel == type) { |
2855 if (_outputExternalMediaCallbackPtr) { | 2859 if (_outputExternalMediaCallbackPtr) { |
2856 _engineStatisticsPtr->SetLastError( | 2860 _engineStatisticsPtr->SetLastError( |
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3244 int64_t min_rtt = 0; | 3248 int64_t min_rtt = 0; |
3245 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != | 3249 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != |
3246 0) { | 3250 0) { |
3247 return 0; | 3251 return 0; |
3248 } | 3252 } |
3249 return rtt; | 3253 return rtt; |
3250 } | 3254 } |
3251 | 3255 |
3252 } // namespace voe | 3256 } // namespace voe |
3253 } // namespace webrtc | 3257 } // namespace webrtc |
OLD | NEW |