From d708677d7a8d09a509e284e30d1da296eb35caae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Thu, 3 Dec 2020 16:34:05 +0100 Subject: [PATCH] Cleans up WebRTC-Pacer-SmallFirstProbePacket flag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I535e18a5f1eabea2c24c17bc42602689f356c647 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196362 Reviewed-by: Per Kjellander Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#32776} --- modules/pacing/pacing_controller.cc | 4 +--- modules/pacing/pacing_controller.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/pacing/pacing_controller.cc b/modules/pacing/pacing_controller.cc index 5ffbc903b3..3ac7afa7ea 100644 --- a/modules/pacing/pacing_controller.cc +++ b/modules/pacing/pacing_controller.cc @@ -112,8 +112,6 @@ PacingController::PacingController(Clock* clock, send_padding_if_silent_( IsEnabled(*field_trials_, "WebRTC-Pacer-PadInSilence")), pace_audio_(IsEnabled(*field_trials_, "WebRTC-Pacer-BlockAudio")), - small_first_probe_packet_( - !IsDisabled(*field_trials_, "WebRTC-Pacer-SmallFirstProbePacket")), ignore_transport_overhead_( IsEnabled(*field_trials_, "WebRTC-Pacer-IgnoreTransportOverhead")), padding_target_duration_(GetDynamicPaddingTarget(*field_trials_)), @@ -519,7 +517,7 @@ void PacingController::ProcessPackets() { // The paused state is checked in the loop since it leaves the critical // section allowing the paused state to be changed from other code. while (!paused_) { - if (small_first_probe_packet_ && first_packet_in_probe) { + if (first_packet_in_probe) { // If first packet in probe, insert a small padding packet so we have a // more reliable start window for the rate estimation. auto padding = packet_sender_->GeneratePadding(DataSize::Bytes(1)); diff --git a/modules/pacing/pacing_controller.h b/modules/pacing/pacing_controller.h index 6e0f9bd5b2..b0bdfb2e42 100644 --- a/modules/pacing/pacing_controller.h +++ b/modules/pacing/pacing_controller.h @@ -182,7 +182,6 @@ class PacingController { const bool drain_large_queues_; const bool send_padding_if_silent_; const bool pace_audio_; - const bool small_first_probe_packet_; const bool ignore_transport_overhead_; // In dynamic mode, indicates the target size when requesting padding, // expressed as a duration in order to adjust for varying padding rate.