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

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

Issue 2516983004: Move ownership of PacketRouter from CongestionController to Call. (Closed)
Patch Set: Rebased. Created 4 years, 1 month 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 8663489d54903d2b33c42baf5e72f20ee22f6ee7..632847e18ac70677e819cf3728269ba8be6c34b5 100644
--- a/webrtc/modules/congestion_controller/include/congestion_controller.h
+++ b/webrtc/modules/congestion_controller/include/congestion_controller.h
@@ -56,12 +56,13 @@ class CongestionController : public CallStatsObserver, public Module {
CongestionController(Clock* clock,
Observer* observer,
RemoteBitrateObserver* remote_bitrate_observer,
- RtcEventLog* event_log);
+ RtcEventLog* event_log,
+ PacketRouter* packet_router);
CongestionController(Clock* clock,
Observer* observer,
RemoteBitrateObserver* remote_bitrate_observer,
RtcEventLog* event_log,
- std::unique_ptr<PacketRouter> packet_router,
+ PacketRouter* packet_router,
std::unique_ptr<PacedSender> pacer);
virtual ~CongestionController();
@@ -79,7 +80,6 @@ class CongestionController : public CallStatsObserver, public Module {
bool send_side_bwe);
virtual int64_t GetPacerQueuingDelayMs() const;
virtual PacedSender* pacer() { return pacer_.get(); }
- virtual PacketRouter* packet_router() { return packet_router_.get(); }
virtual TransportFeedbackObserver* GetTransportFeedbackObserver();
RateLimiter* GetRetransmissionRateLimiter();
@@ -106,7 +106,6 @@ class CongestionController : public CallStatsObserver, public Module {
void Process() override;
private:
- void Init();
void MaybeTriggerOnNetworkChanged();
bool IsSendQueueFull() const;
@@ -116,7 +115,7 @@ class CongestionController : public CallStatsObserver, public Module {
int64_t rtt);
Clock* const clock_;
Observer* const observer_;
- const std::unique_ptr<PacketRouter> packet_router_;
+ PacketRouter* const packet_router_;
const std::unique_ptr<PacedSender> pacer_;
const std::unique_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;
const std::unique_ptr<BitrateController> bitrate_controller_;

Powered by Google App Engine
This is Rietveld 408576698