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

Unified Diff: webrtc/modules/congestion_controller/include/congestion_controller.h

Issue 3000773002: Move PacedSender ownership to RtpTransportControllerSend. (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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/congestion_controller/include/congestion_controller.h
diff --git a/webrtc/modules/congestion_controller/include/congestion_controller.h b/webrtc/modules/congestion_controller/include/congestion_controller.h
index ce9fbc58b01532069875851e33c5b5eff4fe5573..69d0810f4a805c965fda51fede42bdcb1df0c7be 100644
--- a/webrtc/modules/congestion_controller/include/congestion_controller.h
+++ b/webrtc/modules/congestion_controller/include/congestion_controller.h
@@ -49,20 +49,13 @@ class CongestionController : public CallStatsObserver,
public:
using Observer = SendSideCongestionController::Observer;
- CongestionController(const Clock* clock,
- Observer* observer,
- RemoteBitrateObserver* /* remote_bitrate_observer */,
- RtcEventLog* event_log,
- PacketRouter* packet_router)
- : send_side_cc_(clock, observer, event_log, packet_router),
- receive_side_cc_(clock, packet_router) {}
CongestionController(const Clock* clock,
Observer* observer,
RemoteBitrateObserver* /* remote_bitrate_observer */,
RtcEventLog* event_log,
PacketRouter* packet_router,
- std::unique_ptr<PacedSender> pacer)
- : send_side_cc_(clock, observer, event_log, std::move(pacer)),
+ PacedSender* pacer)
+ : send_side_cc_(clock, observer, event_log, pacer),
receive_side_cc_(clock, packet_router) {}
virtual ~CongestionController() {}
@@ -87,10 +80,6 @@ class CongestionController : public CallStatsObserver,
virtual RemoteBitrateEstimator* GetRemoteBitrateEstimator(
bool send_side_bwe);
virtual int64_t GetPacerQueuingDelayMs() const;
- // TODO(nisse): Delete this accessor function. The pacer should be
- // internal to the congestion controller. Currently needed by Call,
- // to register the pacer module on the right thread.
- virtual PacedSender* pacer() { return send_side_cc_.pacer(); }
// TODO(nisse): Delete this method, as soon as downstream projects
// are updated.
virtual TransportFeedbackObserver* GetTransportFeedbackObserver() {

Powered by Google App Engine
This is Rietveld 408576698