From 81eca8306bf7ae4ce589951f539e291372fcea95 Mon Sep 17 00:00:00 2001 From: Qingsi Wang Date: Wed, 1 May 2024 05:55:56 +0000 Subject: [PATCH] Revert "Remove unused WebRTC-Bwe-InjectedCongestionController" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c95cb6bd3e221cd54d3060654abf91abc9a2fac5. Reason for revert: Breaks downstream project Original change's description: > Remove unused WebRTC-Bwe-InjectedCongestionController > > 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} Bug: webrtc:8415 Change-Id: I3800ce1a65e7ef40313d67308a24d5daa6d3a028 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/349560 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Commit-Queue: Qingsi Wang Reviewed-by: Per Kjellander Cr-Commit-Position: refs/heads/main@{#42213} --- experiments/field_trials.py | 5 ++++- pc/peer_connection_factory.cc | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/experiments/field_trials.py b/experiments/field_trials.py index be070fa9a2..73419bf1f7 100755 --- a/experiments/field_trials.py +++ b/experiments/field_trials.py @@ -508,6 +508,9 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ FieldTrial('WebRTC-Bwe-InitialProbing', 42220440, date(2024, 4, 1)), + FieldTrial('WebRTC-Bwe-InjectedCongestionController', + 'webrtc:8415', + INDEFINITE), FieldTrial('WebRTC-Bwe-LimitProbesLowerThanThroughputEstimate', 42221601, date(2024, 4, 1)), @@ -887,7 +890,7 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ ]) # yapf: disable POLICY_EXEMPT_FIELD_TRIALS_DIGEST: str = \ - '0b9e14e036ffd4b96ef5e4d6a6aa67b6a1eff11f' + '263c7a29291a7c4472ff60c7c3b2520f6dd5cea8' 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 e62a680116..ed0d347273 100644 --- a/pc/peer_connection_factory.cc +++ b/pc/peer_connection_factory.cc @@ -335,13 +335,14 @@ std::unique_ptr PeerConnectionFactory::CreateCall_w( network_state_predictor_factory_.get(); call_config.neteq_factory = neteq_factory_.get(); - if (injected_network_controller_factory_) { + if (IsTrialEnabled("WebRTC-Bwe-InjectedCongestionController")) { 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();