Using TaskQueue for congestion controller by default.

This changed the field trial so the TaskQueue based congestion
controller is opt-out rather than opt-in. This prepares for removing
the legacy version of SendSideCongestionController.

Bug: webrtc:9586
Change-Id: I2cd1ca9d3f9b6e3797c856b180790c191653b0ef
Reviewed-on: https://webrtc-review.googlesource.com/c/104521
Reviewed-by: Christoffer Rodbro <crodbro@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25055}
This commit is contained in:
Sebastian Jansson 2018-10-08 11:15:04 +02:00 committed by Commit Bot
parent 4b14416c29
commit 4ff72140e6

View File

@ -26,11 +26,6 @@ static const size_t kMaxOverheadBytes = 500;
const char kTaskQueueExperiment[] = "WebRTC-TaskQueueCongestionControl";
using TaskQueueController = webrtc::webrtc_cc::SendSideCongestionController;
bool TaskQueueExperimentEnabled() {
std::string trial = webrtc::field_trial::FindFullName(kTaskQueueExperiment);
return trial.find("Enable") == 0;
}
std::unique_ptr<SendSideCongestionControllerInterface> CreateController(
Clock* clock,
rtc::TaskQueue* task_queue,
@ -70,9 +65,9 @@ RtpTransportControllerSend::RtpTransportControllerSend(
retransmission_rate_limiter_(clock, kRetransmitWindowSizeMs),
task_queue_("rtp_send_controller") {
// Created after task_queue to be able to post to the task queue internally.
send_side_cc_ =
CreateController(clock, &task_queue_, event_log, &pacer_, bitrate_config,
TaskQueueExperimentEnabled(), controller_factory);
send_side_cc_ = CreateController(
clock, &task_queue_, event_log, &pacer_, bitrate_config,
!field_trial::IsDisabled(kTaskQueueExperiment), controller_factory);
process_thread_->RegisterModule(&pacer_, RTC_FROM_HERE);
process_thread_->RegisterModule(send_side_cc_.get(), RTC_FROM_HERE);