commit 81eca8306bf7ae4ce589951f539e291372fcea95
author Qingsi Wang <qingsi@google.com> Wed May 01 05:55:56 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu May 02 18:32:19 2024
tree fa19aa4aba114f0e99b34acc44c6ba229b76c99b
parent 62735ddd446e8079dd618ac0ac9080566368edd5

Revert "Remove unused WebRTC-Bwe-InjectedCongestionController"

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 <terelius@webrtc.org>
> Commit-Queue: Per Kjellander <perkj@webrtc.org>
> 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 <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Qingsi Wang <qingsi@google.com>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42213}

experiments/field_trials.py

diff --git a/experiments/field_trials.py b/experiments/field_trials.py
index be070fa..73419bf 100755
--- a/experiments/field_trials.py
+++ b/experiments/field_trials.py
@@ -508,6 +508,9 @@
     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 @@
 ])  # yapf: disable
 
 POLICY_EXEMPT_FIELD_TRIALS_DIGEST: str = \
-    '0b9e14e036ffd4b96ef5e4d6a6aa67b6a1eff11f'
+    '263c7a29291a7c4472ff60c7c3b2520f6dd5cea8'
 
 REGISTERED_FIELD_TRIALS: FrozenSet[FieldTrial] = ACTIVE_FIELD_TRIALS.union(
     POLICY_EXEMPT_FIELD_TRIALS)

pc/peer_connection_factory.cc

diff --git a/pc/peer_connection_factory.cc b/pc/peer_connection_factory.cc
index e62a680..ed0d347 100644
--- a/pc/peer_connection_factory.cc
+++ b/pc/peer_connection_factory.cc
@@ -335,13 +335,14 @@
       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();