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

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

Issue 2988153003: Replace CHECK(x && y) with two separate CHECK() calls (Closed)
Patch Set: fix mistakes 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/rtc_base/socketaddress.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 2484 matching lines...) Expand 10 before | Expand all | Expand 10 after
2495 void Channel::RegisterSenderCongestionControlObjects( 2495 void Channel::RegisterSenderCongestionControlObjects(
2496 RtpTransportControllerSendInterface* transport, 2496 RtpTransportControllerSendInterface* transport,
2497 RtcpBandwidthObserver* bandwidth_observer) { 2497 RtcpBandwidthObserver* bandwidth_observer) {
2498 RtpPacketSender* rtp_packet_sender = transport->packet_sender(); 2498 RtpPacketSender* rtp_packet_sender = transport->packet_sender();
2499 TransportFeedbackObserver* transport_feedback_observer = 2499 TransportFeedbackObserver* transport_feedback_observer =
2500 transport->transport_feedback_observer(); 2500 transport->transport_feedback_observer();
2501 PacketRouter* packet_router = transport->packet_router(); 2501 PacketRouter* packet_router = transport->packet_router();
2502 2502
2503 RTC_DCHECK(rtp_packet_sender); 2503 RTC_DCHECK(rtp_packet_sender);
2504 RTC_DCHECK(transport_feedback_observer); 2504 RTC_DCHECK(transport_feedback_observer);
2505 RTC_DCHECK(packet_router && !packet_router_); 2505 RTC_DCHECK(packet_router);
2506 RTC_DCHECK(!packet_router_);
2506 rtcp_observer_->SetBandwidthObserver(bandwidth_observer); 2507 rtcp_observer_->SetBandwidthObserver(bandwidth_observer);
2507 feedback_observer_proxy_->SetTransportFeedbackObserver( 2508 feedback_observer_proxy_->SetTransportFeedbackObserver(
2508 transport_feedback_observer); 2509 transport_feedback_observer);
2509 seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router); 2510 seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router);
2510 rtp_packet_sender_proxy_->SetPacketSender(rtp_packet_sender); 2511 rtp_packet_sender_proxy_->SetPacketSender(rtp_packet_sender);
2511 _rtpRtcpModule->SetStorePacketsStatus(true, 600); 2512 _rtpRtcpModule->SetStorePacketsStatus(true, 600);
2512 constexpr bool remb_candidate = false; 2513 constexpr bool remb_candidate = false;
2513 packet_router->AddSendRtpModule(_rtpRtcpModule.get(), remb_candidate); 2514 packet_router->AddSendRtpModule(_rtpRtcpModule.get(), remb_candidate);
2514 packet_router_ = packet_router; 2515 packet_router_ = packet_router;
2515 } 2516 }
2516 2517
2517 void Channel::RegisterReceiverCongestionControlObjects( 2518 void Channel::RegisterReceiverCongestionControlObjects(
2518 PacketRouter* packet_router) { 2519 PacketRouter* packet_router) {
2519 RTC_DCHECK(packet_router && !packet_router_); 2520 RTC_DCHECK(packet_router);
2521 RTC_DCHECK(!packet_router_);
2520 constexpr bool remb_candidate = false; 2522 constexpr bool remb_candidate = false;
2521 packet_router->AddReceiveRtpModule(_rtpRtcpModule.get(), remb_candidate); 2523 packet_router->AddReceiveRtpModule(_rtpRtcpModule.get(), remb_candidate);
2522 packet_router_ = packet_router; 2524 packet_router_ = packet_router;
2523 } 2525 }
2524 2526
2525 void Channel::ResetSenderCongestionControlObjects() { 2527 void Channel::ResetSenderCongestionControlObjects() {
2526 RTC_DCHECK(packet_router_); 2528 RTC_DCHECK(packet_router_);
2527 _rtpRtcpModule->SetStorePacketsStatus(false, 600); 2529 _rtpRtcpModule->SetStorePacketsStatus(false, 600);
2528 rtcp_observer_->SetBandwidthObserver(nullptr); 2530 rtcp_observer_->SetBandwidthObserver(nullptr);
2529 feedback_observer_proxy_->SetTransportFeedbackObserver(nullptr); 2531 feedback_observer_proxy_->SetTransportFeedbackObserver(nullptr);
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
3163 int64_t min_rtt = 0; 3165 int64_t min_rtt = 0;
3164 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != 3166 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
3165 0) { 3167 0) {
3166 return 0; 3168 return 0;
3167 } 3169 }
3168 return rtt; 3170 return rtt;
3169 } 3171 }
3170 3172
3171 } // namespace voe 3173 } // namespace voe
3172 } // namespace webrtc 3174 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/rtc_base/socketaddress.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698