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 2399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2410 | 2410 |
2411 RTC_DCHECK(rtp_packet_sender); | 2411 RTC_DCHECK(rtp_packet_sender); |
2412 RTC_DCHECK(transport_feedback_observer); | 2412 RTC_DCHECK(transport_feedback_observer); |
2413 RTC_DCHECK(packet_router && !packet_router_); | 2413 RTC_DCHECK(packet_router && !packet_router_); |
2414 rtcp_observer_->SetBandwidthObserver(bandwidth_observer); | 2414 rtcp_observer_->SetBandwidthObserver(bandwidth_observer); |
2415 feedback_observer_proxy_->SetTransportFeedbackObserver( | 2415 feedback_observer_proxy_->SetTransportFeedbackObserver( |
2416 transport_feedback_observer); | 2416 transport_feedback_observer); |
2417 seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router); | 2417 seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router); |
2418 rtp_packet_sender_proxy_->SetPacketSender(rtp_packet_sender); | 2418 rtp_packet_sender_proxy_->SetPacketSender(rtp_packet_sender); |
2419 _rtpRtcpModule->SetStorePacketsStatus(true, 600); | 2419 _rtpRtcpModule->SetStorePacketsStatus(true, 600); |
2420 packet_router->AddRtpModule(_rtpRtcpModule.get()); | 2420 packet_router->AddSendRtpModule(_rtpRtcpModule.get()); |
2421 packet_router_ = packet_router; | 2421 packet_router_ = packet_router; |
2422 } | 2422 } |
2423 | 2423 |
2424 void Channel::RegisterReceiverCongestionControlObjects( | 2424 void Channel::RegisterReceiverCongestionControlObjects( |
2425 PacketRouter* packet_router) { | 2425 PacketRouter* packet_router) { |
2426 RTC_DCHECK(packet_router && !packet_router_); | 2426 RTC_DCHECK(packet_router && !packet_router_); |
2427 packet_router->AddRtpModule(_rtpRtcpModule.get()); | 2427 packet_router->AddReceiveRtpModule(_rtpRtcpModule.get()); |
2428 packet_router_ = packet_router; | 2428 packet_router_ = packet_router; |
2429 } | 2429 } |
2430 | 2430 |
2431 void Channel::ResetCongestionControlObjects() { | 2431 void Channel::ResetSenderCongestionControlObjects() { |
2432 RTC_DCHECK(packet_router_); | 2432 RTC_DCHECK(packet_router_); |
2433 _rtpRtcpModule->SetStorePacketsStatus(false, 600); | 2433 _rtpRtcpModule->SetStorePacketsStatus(false, 600); |
2434 rtcp_observer_->SetBandwidthObserver(nullptr); | 2434 rtcp_observer_->SetBandwidthObserver(nullptr); |
2435 feedback_observer_proxy_->SetTransportFeedbackObserver(nullptr); | 2435 feedback_observer_proxy_->SetTransportFeedbackObserver(nullptr); |
2436 seq_num_allocator_proxy_->SetSequenceNumberAllocator(nullptr); | 2436 seq_num_allocator_proxy_->SetSequenceNumberAllocator(nullptr); |
2437 packet_router_->RemoveRtpModule(_rtpRtcpModule.get()); | 2437 packet_router_->RemoveSendRtpModule(_rtpRtcpModule.get()); |
2438 packet_router_ = nullptr; | 2438 packet_router_ = nullptr; |
2439 rtp_packet_sender_proxy_->SetPacketSender(nullptr); | 2439 rtp_packet_sender_proxy_->SetPacketSender(nullptr); |
2440 } | 2440 } |
2441 | 2441 |
| 2442 void Channel::ResetReceiverCongestionControlObjects() { |
| 2443 RTC_DCHECK(packet_router_); |
| 2444 packet_router_->RemoveReceiveRtpModule(_rtpRtcpModule.get()); |
| 2445 packet_router_ = nullptr; |
| 2446 } |
| 2447 |
2442 void Channel::SetRTCPStatus(bool enable) { | 2448 void Channel::SetRTCPStatus(bool enable) { |
2443 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId), | 2449 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId), |
2444 "Channel::SetRTCPStatus()"); | 2450 "Channel::SetRTCPStatus()"); |
2445 _rtpRtcpModule->SetRTCPStatus(enable ? RtcpMode::kCompound : RtcpMode::kOff); | 2451 _rtpRtcpModule->SetRTCPStatus(enable ? RtcpMode::kCompound : RtcpMode::kOff); |
2446 } | 2452 } |
2447 | 2453 |
2448 int Channel::GetRTCPStatus(bool& enabled) { | 2454 int Channel::GetRTCPStatus(bool& enabled) { |
2449 RtcpMode method = _rtpRtcpModule->RTCP(); | 2455 RtcpMode method = _rtpRtcpModule->RTCP(); |
2450 enabled = (method != RtcpMode::kOff); | 2456 enabled = (method != RtcpMode::kOff); |
2451 return 0; | 2457 return 0; |
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3062 int64_t min_rtt = 0; | 3068 int64_t min_rtt = 0; |
3063 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != | 3069 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != |
3064 0) { | 3070 0) { |
3065 return 0; | 3071 return 0; |
3066 } | 3072 } |
3067 return rtt; | 3073 return rtt; |
3068 } | 3074 } |
3069 | 3075 |
3070 } // namespace voe | 3076 } // namespace voe |
3071 } // namespace webrtc | 3077 } // namespace webrtc |
OLD | NEW |