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

Side by Side Diff: webrtc/call/rtp_transport_controller_send.cc

Issue 3000773002: Move PacedSender ownership to RtpTransportControllerSend. (Closed)
Patch Set: Fix test. 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2017 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
11 #include "webrtc/call/rtp_transport_controller_send.h" 11 #include "webrtc/call/rtp_transport_controller_send.h"
12 12
13 namespace webrtc { 13 namespace webrtc {
14 14
15 RtpTransportControllerSend::RtpTransportControllerSend( 15 RtpTransportControllerSend::RtpTransportControllerSend(
16 Clock* clock, 16 Clock* clock,
17 webrtc::RtcEventLog* event_log) 17 webrtc::RtcEventLog* event_log)
18 : send_side_cc_(clock, nullptr /* observer */, event_log, &packet_router_) { 18 : pacer_(clock, &packet_router_, event_log),
19 } 19 send_side_cc_(clock, nullptr /* observer */, event_log, &pacer_) {}
20 20
21 PacketRouter* RtpTransportControllerSend::packet_router() { 21 PacketRouter* RtpTransportControllerSend::packet_router() {
22 return &packet_router_; 22 return &packet_router_;
23 } 23 }
24 24
25 PacedSender* RtpTransportControllerSend::pacer() {
nisse-webrtc 2017/08/18 06:19:18 The packet_sender() method below returns the same
nisse-webrtc 2017/08/18 07:14:33 And yet another option for the return type is RtpP
stefan-webrtc 2017/08/22 07:37:53 For now we need to return a PacedSender as we have
26 return &pacer_;
27 }
28
25 SendSideCongestionController* RtpTransportControllerSend::send_side_cc() { 29 SendSideCongestionController* RtpTransportControllerSend::send_side_cc() {
26 return &send_side_cc_; 30 return &send_side_cc_;
27 } 31 }
28 32
29 TransportFeedbackObserver* 33 TransportFeedbackObserver*
30 RtpTransportControllerSend::transport_feedback_observer() { 34 RtpTransportControllerSend::transport_feedback_observer() {
31 return &send_side_cc_; 35 return &send_side_cc_;
32 } 36 }
33 37
34 RtpPacketSender* RtpTransportControllerSend::packet_sender() { 38 RtpPacketSender* RtpTransportControllerSend::packet_sender() {
35 return send_side_cc_.pacer(); 39 return &pacer_;
36 } 40 }
37 41
38 const RtpKeepAliveConfig& RtpTransportControllerSend::keepalive_config() const { 42 const RtpKeepAliveConfig& RtpTransportControllerSend::keepalive_config() const {
39 return keepalive_; 43 return keepalive_;
40 } 44 }
41 45
42 void RtpTransportControllerSend::SetKeepAliveConfig( 46 void RtpTransportControllerSend::SetKeepAliveConfig(
43 const RtpKeepAliveConfig& config) { 47 const RtpKeepAliveConfig& config) {
44 keepalive_ = config; 48 keepalive_ = config;
45 } 49 }
46 50
47 } // namespace webrtc 51 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698