From c4f047d62735c70854be6e26a8007012ccd9ffac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Fri, 19 Jul 2019 13:34:11 +0200 Subject: [PATCH] Make WebRTC-Pacer-LegacyPacketReferencing default off MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the code path where packets are directly owned by PacedSender rather that being temporarily put in the RtpPacketHistory the default. Functionally, this should essentially be a noop, with only minor timing differences. The old code-path will stay around for a short while and then be removed once we are certain there are no regressions. Bug: webrtc:10633 Change-Id: Id6360dea48fd0c9d46fde6f5eee93726d4f11d13 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146212 Commit-Queue: Erik Språng Reviewed-by: Stefan Holmer Cr-Commit-Position: refs/heads/master@{#28660} --- modules/pacing/paced_sender.cc | 2 +- modules/rtp_rtcp/source/rtp_sender.cc | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/modules/pacing/paced_sender.cc b/modules/pacing/paced_sender.cc index 0b3e2cac43..58ae5faed9 100644 --- a/modules/pacing/paced_sender.cc +++ b/modules/pacing/paced_sender.cc @@ -100,7 +100,7 @@ PacedSender::PacedSender(Clock* clock, queue_time_limit(kMaxQueueLengthMs), account_for_audio_(false), legacy_packet_referencing_( - !IsDisabled(*field_trials_, "WebRTC-Pacer-LegacyPacketReferencing")) { + IsEnabled(*field_trials_, "WebRTC-Pacer-LegacyPacketReferencing")) { if (!drain_large_queues_) { RTC_LOG(LS_WARNING) << "Pacer queues will not be drained," "pushback experiment must be enabled."; diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc index 69066b8342..98f93cc6e2 100644 --- a/modules/rtp_rtcp/source/rtp_sender.cc +++ b/modules/rtp_rtcp/source/rtp_sender.cc @@ -132,13 +132,6 @@ bool IsEnabled(absl::string_view name, return trials.Lookup(name).find("Enabled") == 0; } -bool IsDisabled(absl::string_view name, - const WebRtcKeyValueConfig* field_trials) { - FieldTrialBasedConfig default_trials; - auto& trials = field_trials ? *field_trials : default_trials; - return trials.Lookup(name).find("Disabled") == 0; -} - bool HasBweExtension(const RtpHeaderExtensionMap& extensions_map) { return extensions_map.IsRegistered(kRtpExtensionTransportSequenceNumber) || extensions_map.IsRegistered(kRtpExtensionTransportSequenceNumber02) || @@ -199,8 +192,8 @@ RTPSender::RTPSender(const RtpRtcp::Configuration& config) send_side_bwe_with_overhead_( IsEnabled("WebRTC-SendSideBwe-WithOverhead", config.field_trials)), pacer_legacy_packet_referencing_( - !IsDisabled("WebRTC-Pacer-LegacyPacketReferencing", - config.field_trials)) { + IsEnabled("WebRTC-Pacer-LegacyPacketReferencing", + config.field_trials)) { // This random initialization is not intended to be cryptographic strong. timestamp_offset_ = random_.Rand(); // Random start, 16 bits. Can't be 0. @@ -282,7 +275,7 @@ RTPSender::RTPSender( .find("Enabled") == 0), pacer_legacy_packet_referencing_( field_trials.Lookup("WebRTC-Pacer-LegacyPacketReferencing") - .find("Disabled") != 0) { + .find("Enabled") == 0) { // This random initialization is not intended to be cryptographic strong. timestamp_offset_ = random_.Rand(); // Random start, 16 bits. Can't be 0.