admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete deprecated CongestionController constructor and packet_router method.

Browse Source 
This is a followup to https://codereview.webrtc.org/2516983004/, to be
landed after downstream projects are updated.

BUG=webrtc:6847

Review-Url: https://codereview.webrtc.org/2548633003
Cr-Commit-Position: refs/heads/master@{#15484}
This commit is contained in:
nisse 2016-12-08 07:49:00 -08:00 committed by Commit bot
parent 01653b1130
commit 7dada5e4c0
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/modules/congestion_controller/congestion_controller.cc
View File

@ -163,17 +163,6 @@ CongestionController::CongestionController(
std::unique_ptr<PacedSender>(new PacedSender(clock, packet_router))) {
}
CongestionController::CongestionController(
Clock* clock,
Observer* observer,
RemoteBitrateObserver* remote_bitrate_observer,
RtcEventLog* event_log)
: CongestionController(clock, observer, remote_bitrate_observer, event_log,
new PacketRouter()) {
// Record ownership.
owned_packet_router_.reset(packet_router_);
}
CongestionController::CongestionController(
Clock* clock,
Observer* observer,

10
webrtc/modules/congestion_controller/include/congestion_controller.h
View File

@ -67,11 +67,6 @@ class CongestionController : public CallStatsObserver, public Module {
RemoteBitrateObserver* remote_bitrate_observer,
RtcEventLog* event_log,
PacketRouter* packet_router);
// TODO(nisse): Deprecated. Will create and own a PacketRouter.
CongestionController(Clock* clock,
Observer* observer,
RemoteBitrateObserver* remote_bitrate_observer,
RtcEventLog* event_log);
CongestionController(Clock* clock,
Observer* observer,
RemoteBitrateObserver* remote_bitrate_observer,
@ -96,8 +91,6 @@ class CongestionController : public CallStatsObserver, public Module {
// TODO(nisse): Delete this accessor function. The pacer should be
// internal to the congestion controller.
virtual PacedSender* pacer() { return pacer_.get(); }
// TODO(nisse): Deprecated, but still used by downstream projects.
virtual PacketRouter* packet_router() { return packet_router_; }
virtual TransportFeedbackObserver* GetTransportFeedbackObserver();
RateLimiter* GetRetransmissionRateLimiter();
void EnablePeriodicAlrProbing(bool enable);
@ -134,9 +127,6 @@ class CongestionController : public CallStatsObserver, public Module {
int64_t rtt);
Clock* const clock_;
Observer* const observer_;
// Used by the deprecated constructor, where caller doesn't provide
// the packet_router.
std::unique_ptr<PacketRouter> owned_packet_router_;
PacketRouter* const packet_router_;
const std::unique_ptr<PacedSender> pacer_;
const std::unique_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;