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

Side by Side Diff: webrtc/modules/congestion_controller/include/congestion_controller.h

Issue 2789843002: Delete VieRemb class, move functionality to PacketRouter. (Closed)
Patch Set: Delete obsolete suppression for PacketRouterTest.SendTransportFeedback. Created 3 years, 8 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) 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 class RtcEventLog; 44 class RtcEventLog;
45 45
46 class CongestionController : public CallStatsObserver, 46 class CongestionController : public CallStatsObserver,
47 public Module, 47 public Module,
48 public TransportFeedbackObserver { 48 public TransportFeedbackObserver {
49 public: 49 public:
50 using Observer = SendSideCongestionController::Observer; 50 using Observer = SendSideCongestionController::Observer;
51 51
52 CongestionController(const Clock* clock, 52 CongestionController(const Clock* clock,
53 Observer* observer, 53 Observer* observer,
54 RemoteBitrateObserver* remote_bitrate_observer, 54 RemoteBitrateObserver* /* remote_bitrate_observer */,
55 RtcEventLog* event_log, 55 RtcEventLog* event_log,
56 PacketRouter* packet_router) 56 PacketRouter* packet_router)
57 : send_side_cc_(clock, observer, event_log, packet_router), 57 : send_side_cc_(clock, observer, event_log, packet_router),
58 receive_side_cc_(clock, remote_bitrate_observer, packet_router) {} 58 receive_side_cc_(clock, packet_router) {}
59 CongestionController(const Clock* clock, 59 CongestionController(const Clock* clock,
60 Observer* observer, 60 Observer* observer,
61 RemoteBitrateObserver* remote_bitrate_observer, 61 RemoteBitrateObserver* remote_bitrate_observer,
62 RtcEventLog* event_log, 62 RtcEventLog* event_log,
63 PacketRouter* packet_router, 63 PacketRouter* packet_router,
64 std::unique_ptr<PacedSender> pacer) 64 std::unique_ptr<PacedSender> pacer)
65 : send_side_cc_(clock, observer, event_log, std::move(pacer)), 65 : send_side_cc_(clock, observer, event_log, std::move(pacer)),
66 receive_side_cc_(clock, remote_bitrate_observer, packet_router) {} 66 receive_side_cc_(clock, packet_router) {}
67 67
68 virtual ~CongestionController() {} 68 virtual ~CongestionController() {}
69 69
70 virtual void OnReceivedPacket(int64_t arrival_time_ms, 70 virtual void OnReceivedPacket(int64_t arrival_time_ms,
71 size_t payload_size, 71 size_t payload_size,
72 const RTPHeader& header); 72 const RTPHeader& header);
73 73
74 virtual void SetBweBitrates(int min_bitrate_bps, 74 virtual void SetBweBitrates(int min_bitrate_bps,
75 int start_bitrate_bps, 75 int start_bitrate_bps,
76 int max_bitrate_bps); 76 int max_bitrate_bps);
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 private: 132 private:
133 SendSideCongestionController send_side_cc_; 133 SendSideCongestionController send_side_cc_;
134 ReceiveSideCongestionController receive_side_cc_; 134 ReceiveSideCongestionController receive_side_cc_;
135 135
136 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CongestionController); 136 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CongestionController);
137 }; 137 };
138 138
139 } // namespace webrtc 139 } // namespace webrtc
140 140
141 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_ 141 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698