admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Remove unused WebRTC-Bwe-InjectedCongestionController"

Browse Source 
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}
This commit is contained in:
Qingsi Wang 2024-05-01 05:55:56 +00:00 committed by WebRTC LUCI CQ
parent 62735ddd44
commit 81eca8306b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
experiments/field_trials.py
View File

@ -508,6 +508,9 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
FieldTrial('WebRTC-Bwe-InitialProbing', FieldTrial('WebRTC-Bwe-InitialProbing',
42220440, 42220440,
date(2024, 4, 1)), date(2024, 4, 1)),
FieldTrial('WebRTC-Bwe-InjectedCongestionController',
'webrtc:8415',
INDEFINITE),
FieldTrial('WebRTC-Bwe-LimitProbesLowerThanThroughputEstimate', FieldTrial('WebRTC-Bwe-LimitProbesLowerThanThroughputEstimate',
42221601, 42221601,
date(2024, 4, 1)), date(2024, 4, 1)),
@ -887,7 +890,7 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
]) # yapf: disable ]) # yapf: disable
POLICY_EXEMPT_FIELD_TRIALS_DIGEST: str = \ POLICY_EXEMPT_FIELD_TRIALS_DIGEST: str = \
'0b9e14e036ffd4b96ef5e4d6a6aa67b6a1eff11f' '263c7a29291a7c4472ff60c7c3b2520f6dd5cea8'
REGISTERED_FIELD_TRIALS: FrozenSet[FieldTrial] = ACTIVE_FIELD_TRIALS.union( REGISTERED_FIELD_TRIALS: FrozenSet[FieldTrial] = ACTIVE_FIELD_TRIALS.union(
POLICY_EXEMPT_FIELD_TRIALS) POLICY_EXEMPT_FIELD_TRIALS)

3
pc/peer_connection_factory.cc
View File

@ -335,13 +335,14 @@ std::unique_ptr<Call> PeerConnectionFactory::CreateCall_w(
network_state_predictor_factory_.get(); network_state_predictor_factory_.get();
call_config.neteq_factory = neteq_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"; RTC_LOG(LS_INFO) << "Using injected network controller factory";
call_config.network_controller_factory = call_config.network_controller_factory =
injected_network_controller_factory_.get(); injected_network_controller_factory_.get();
} else { } else {
RTC_LOG(LS_INFO) << "Using default network controller factory"; RTC_LOG(LS_INFO) << "Using default network controller factory";
} }
call_config.rtp_transport_controller_send_factory = call_config.rtp_transport_controller_send_factory =
transport_controller_send_factory_.get(); transport_controller_send_factory_.get();
call_config.decode_metronome = decode_metronome_.get(); call_config.decode_metronome = decode_metronome_.get();