zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete deprecated constructor of SendSideCongestionController.

Browse Source 
Move packet_router #include to where it's needed, and delete unused
MockPacketRouter.

Bug: webrtc:6847
Change-Id: I03c86c6fb8b413f5a535a237fa1724cc10960ffa
Reviewed-on: https://webrtc-review.googlesource.com/17320
Commit-Queue: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20564}
This commit is contained in:
Niels Möller
2017-10-31 10:19:10 +01:00
committed by Commit Bot
parent e3a4da9f44
commit fd6c0914c5
7 changed files with 6 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
modules/congestion_controller/send_side_congestion_controller.cc
View File

@ -94,47 +94,6 @@ void SortPacketFeedbackVector(
} // namespace
SendSideCongestionController::SendSideCongestionController(
const Clock* clock,
Observer* observer,
RtcEventLog* event_log,
PacketRouter* packet_router)
: clock_(clock),
observer_(observer),
event_log_(event_log),
owned_pacer_(
rtc::MakeUnique<PacedSender>(clock, packet_router, event_log)),
pacer_(owned_pacer_.get()),
bitrate_controller_(
BitrateController::CreateBitrateController(clock_, event_log)),
acknowledged_bitrate_estimator_(
rtc::MakeUnique<AcknowledgedBitrateEstimator>()),
probe_controller_(new ProbeController(pacer_, clock_)),
retransmission_rate_limiter_(
new RateLimiter(clock, kRetransmitWindowSizeMs)),
transport_feedback_adapter_(clock_),
last_reported_bitrate_bps_(0),
last_reported_fraction_loss_(0),
last_reported_rtt_(0),
network_state_(kNetworkUp),
pause_pacer_(false),
pacer_paused_(false),
min_bitrate_bps_(congestion_controller::GetMinBitrateBps()),
delay_based_bwe_(new DelayBasedBwe(event_log_, clock_)),
in_cwnd_experiment_(CwndExperimentEnabled()),
accepted_queue_ms_(kDefaultAcceptedQueueMs),
was_in_alr_(false),
pacer_pushback_experiment_(
webrtc::field_trial::IsEnabled(kPacerPushbackExperiment)) {
delay_based_bwe_->SetMinBitrate(min_bitrate_bps_);
if (in_cwnd_experiment_ &&
!ReadCwndExperimentParameter(&accepted_queue_ms_)) {
LOG(LS_WARNING) << "Failed to parse parameters for CwndExperiment "
"from field trial string. Experiment disabled.";
in_cwnd_experiment_ = false;
}
}
SendSideCongestionController::SendSideCongestionController(
const Clock* clock,
Observer* observer,