Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Side by Side Diff: webrtc/voice_engine/channel.cc

Issue 2973363002: Explicitly inform PacketRouter which RTP-RTCP modules are REMB-candidates (Closed)
Patch Set: . Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2490 matching lines...) Expand 10 before | Expand all | Expand 10 after
2501 2501
2502 RTC_DCHECK(rtp_packet_sender); 2502 RTC_DCHECK(rtp_packet_sender);
2503 RTC_DCHECK(transport_feedback_observer); 2503 RTC_DCHECK(transport_feedback_observer);
2504 RTC_DCHECK(packet_router && !packet_router_); 2504 RTC_DCHECK(packet_router && !packet_router_);
2505 rtcp_observer_->SetBandwidthObserver(bandwidth_observer); 2505 rtcp_observer_->SetBandwidthObserver(bandwidth_observer);
2506 feedback_observer_proxy_->SetTransportFeedbackObserver( 2506 feedback_observer_proxy_->SetTransportFeedbackObserver(
2507 transport_feedback_observer); 2507 transport_feedback_observer);
2508 seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router); 2508 seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router);
2509 rtp_packet_sender_proxy_->SetPacketSender(rtp_packet_sender); 2509 rtp_packet_sender_proxy_->SetPacketSender(rtp_packet_sender);
2510 _rtpRtcpModule->SetStorePacketsStatus(true, 600); 2510 _rtpRtcpModule->SetStorePacketsStatus(true, 600);
2511 packet_router->AddSendRtpModule(_rtpRtcpModule.get()); 2511 constexpr bool remb_candidate = false;
2512 packet_router->AddSendRtpModule(_rtpRtcpModule.get(), remb_candidate);
2512 packet_router_ = packet_router; 2513 packet_router_ = packet_router;
2513 } 2514 }
2514 2515
2515 void Channel::RegisterReceiverCongestionControlObjects( 2516 void Channel::RegisterReceiverCongestionControlObjects(
2516 PacketRouter* packet_router) { 2517 PacketRouter* packet_router) {
2517 RTC_DCHECK(packet_router && !packet_router_); 2518 RTC_DCHECK(packet_router && !packet_router_);
2518 packet_router->AddReceiveRtpModule(_rtpRtcpModule.get()); 2519 constexpr bool remb_candidate = false;
2520 packet_router->AddReceiveRtpModule(_rtpRtcpModule.get(), remb_candidate);
2519 packet_router_ = packet_router; 2521 packet_router_ = packet_router;
2520 } 2522 }
2521 2523
2522 void Channel::ResetSenderCongestionControlObjects() { 2524 void Channel::ResetSenderCongestionControlObjects() {
2523 RTC_DCHECK(packet_router_); 2525 RTC_DCHECK(packet_router_);
2524 _rtpRtcpModule->SetStorePacketsStatus(false, 600); 2526 _rtpRtcpModule->SetStorePacketsStatus(false, 600);
2525 rtcp_observer_->SetBandwidthObserver(nullptr); 2527 rtcp_observer_->SetBandwidthObserver(nullptr);
2526 feedback_observer_proxy_->SetTransportFeedbackObserver(nullptr); 2528 feedback_observer_proxy_->SetTransportFeedbackObserver(nullptr);
2527 seq_num_allocator_proxy_->SetSequenceNumberAllocator(nullptr); 2529 seq_num_allocator_proxy_->SetSequenceNumberAllocator(nullptr);
2528 packet_router_->RemoveSendRtpModule(_rtpRtcpModule.get()); 2530 packet_router_->RemoveSendRtpModule(_rtpRtcpModule.get());
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
3159 int64_t min_rtt = 0; 3161 int64_t min_rtt = 0;
3160 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != 3162 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
3161 0) { 3163 0) {
3162 return 0; 3164 return 0;
3163 } 3165 }
3164 return rtt; 3166 return rtt;
3165 } 3167 }
3166 3168
3167 } // namespace voe 3169 } // namespace voe
3168 } // namespace webrtc 3170 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698