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 2479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2490 | 2490 |
2491 RTC_DCHECK(rtp_packet_sender); | 2491 RTC_DCHECK(rtp_packet_sender); |
2492 RTC_DCHECK(transport_feedback_observer); | 2492 RTC_DCHECK(transport_feedback_observer); |
2493 RTC_DCHECK(packet_router && !packet_router_); | 2493 RTC_DCHECK(packet_router && !packet_router_); |
2494 rtcp_observer_->SetBandwidthObserver(bandwidth_observer); | 2494 rtcp_observer_->SetBandwidthObserver(bandwidth_observer); |
2495 feedback_observer_proxy_->SetTransportFeedbackObserver( | 2495 feedback_observer_proxy_->SetTransportFeedbackObserver( |
2496 transport_feedback_observer); | 2496 transport_feedback_observer); |
2497 seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router); | 2497 seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router); |
2498 rtp_packet_sender_proxy_->SetPacketSender(rtp_packet_sender); | 2498 rtp_packet_sender_proxy_->SetPacketSender(rtp_packet_sender); |
2499 _rtpRtcpModule->SetStorePacketsStatus(true, 600); | 2499 _rtpRtcpModule->SetStorePacketsStatus(true, 600); |
2500 packet_router->AddSendRtpModule(_rtpRtcpModule.get()); | 2500 constexpr bool remb_candidate = false; |
| 2501 packet_router->AddSendRtpModule(_rtpRtcpModule.get(), remb_candidate); |
2501 packet_router_ = packet_router; | 2502 packet_router_ = packet_router; |
2502 } | 2503 } |
2503 | 2504 |
2504 void Channel::RegisterReceiverCongestionControlObjects( | 2505 void Channel::RegisterReceiverCongestionControlObjects( |
2505 PacketRouter* packet_router) { | 2506 PacketRouter* packet_router) { |
2506 RTC_DCHECK(packet_router && !packet_router_); | 2507 RTC_DCHECK(packet_router && !packet_router_); |
2507 packet_router->AddReceiveRtpModule(_rtpRtcpModule.get()); | 2508 constexpr bool remb_candidate = false; |
| 2509 packet_router->AddReceiveRtpModule(_rtpRtcpModule.get(), remb_candidate); |
2508 packet_router_ = packet_router; | 2510 packet_router_ = packet_router; |
2509 } | 2511 } |
2510 | 2512 |
2511 void Channel::ResetSenderCongestionControlObjects() { | 2513 void Channel::ResetSenderCongestionControlObjects() { |
2512 RTC_DCHECK(packet_router_); | 2514 RTC_DCHECK(packet_router_); |
2513 _rtpRtcpModule->SetStorePacketsStatus(false, 600); | 2515 _rtpRtcpModule->SetStorePacketsStatus(false, 600); |
2514 rtcp_observer_->SetBandwidthObserver(nullptr); | 2516 rtcp_observer_->SetBandwidthObserver(nullptr); |
2515 feedback_observer_proxy_->SetTransportFeedbackObserver(nullptr); | 2517 feedback_observer_proxy_->SetTransportFeedbackObserver(nullptr); |
2516 seq_num_allocator_proxy_->SetSequenceNumberAllocator(nullptr); | 2518 seq_num_allocator_proxy_->SetSequenceNumberAllocator(nullptr); |
2517 packet_router_->RemoveSendRtpModule(_rtpRtcpModule.get()); | 2519 packet_router_->RemoveSendRtpModule(_rtpRtcpModule.get()); |
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3140 int64_t min_rtt = 0; | 3142 int64_t min_rtt = 0; |
3141 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != | 3143 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != |
3142 0) { | 3144 0) { |
3143 return 0; | 3145 return 0; |
3144 } | 3146 } |
3145 return rtt; | 3147 return rtt; |
3146 } | 3148 } |
3147 | 3149 |
3148 } // namespace voe | 3150 } // namespace voe |
3149 } // namespace webrtc | 3151 } // namespace webrtc |
OLD | NEW |