From c95cb6bd3e221cd54d3060654abf91abc9a2fac5 Mon Sep 17 00:00:00 2001 From: Per K Date: Fri, 19 Apr 2024 06:22:27 +0000 Subject: [PATCH] Remove unused WebRTC-Bwe-InjectedCongestionController MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead, PeerConnectionFactoryDependencies.network_controller_factory is used if it exists. Bug: webrtc:8415 Change-Id: I37d5cc7325072bf1d87993e53949f1b97c277f55 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/347860 Reviewed-by: Björn Terelius Commit-Queue: Per Kjellander Cr-Commit-Position: refs/heads/main@{#42120} --- experiments/field_trials.py | 5 +---- pc/peer_connection_factory.cc | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/experiments/field_trials.py b/experiments/field_trials.py index 9bdcb58a5c..468b94eff1 100755 --- a/experiments/field_trials.py +++ b/experiments/field_trials.py @@ -502,9 +502,6 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ FieldTrial('WebRTC-Bwe-InitialProbing', 'webrtc:10394', date(2024, 4, 1)), - FieldTrial('WebRTC-Bwe-InjectedCongestionController', - 'webrtc:8415', - INDEFINITE), FieldTrial('WebRTC-Bwe-LimitProbesLowerThanThroughputEstimate', 'webrtc:11498', date(2024, 4, 1)), @@ -884,7 +881,7 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ ]) # yapf: disable POLICY_EXEMPT_FIELD_TRIALS_DIGEST: str = \ - '263c7a29291a7c4472ff60c7c3b2520f6dd5cea8' + '0b9e14e036ffd4b96ef5e4d6a6aa67b6a1eff11f' REGISTERED_FIELD_TRIALS: FrozenSet[FieldTrial] = ACTIVE_FIELD_TRIALS.union( POLICY_EXEMPT_FIELD_TRIALS) diff --git a/pc/peer_connection_factory.cc b/pc/peer_connection_factory.cc index 6bf0ef944a..92fdfc8026 100644 --- a/pc/peer_connection_factory.cc +++ b/pc/peer_connection_factory.cc @@ -335,14 +335,13 @@ std::unique_ptr PeerConnectionFactory::CreateCall_w( network_state_predictor_factory_.get(); call_config.neteq_factory = neteq_factory_.get(); - if (IsTrialEnabled("WebRTC-Bwe-InjectedCongestionController")) { + if (injected_network_controller_factory_) { RTC_LOG(LS_INFO) << "Using injected network controller factory"; call_config.network_controller_factory = injected_network_controller_factory_.get(); } else { RTC_LOG(LS_INFO) << "Using default network controller factory"; } - call_config.rtp_transport_controller_send_factory = transport_controller_send_factory_.get(); call_config.decode_metronome = decode_metronome_.get();