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

Delete the WebRTC-H264Simulcast/Disabled/ field trial.

Browse Source 
The field trial has been enabled-by-default for several years, I
suspect it was needed during its development but there doesn't seem to
be any reason to maintain it going forward.

Its very existence blocks our long term objective to have our APIs
behave according to the W3C standards and any apps still depending on
it, if there are any, should make sure to use the APIs correctly
instead. I assume they already do any any references to this is us
forgetting to clean things up.

Bug: webrtc:15161
Change-Id: I4a6a44a15219d2e045f3d8d857b5197a064f049c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/304660
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Auto-Submit: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40025}
This commit is contained in:
Henrik Boström 2023-05-09 11:57:36 +02:00 committed by WebRTC LUCI CQ
parent e0034a800e
commit e90d9344b8
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
media/engine/webrtc_video_engine.cc
View File

@ -310,17 +310,12 @@ static bool ValidateStreamParams(const StreamParams& sp) {
// Returns true if the given codec is disallowed from doing simulcast.
bool IsCodecDisabledForSimulcast(bool legacy_scalability_mode,
webrtc::VideoCodecType codec_type,
const webrtc::FieldTrialsView& trials) {
webrtc::VideoCodecType codec_type) {
if (legacy_scalability_mode && (codec_type == webrtc::kVideoCodecVP9 ||
codec_type == webrtc::kVideoCodecAV1)) {
return true;
}
if (codec_type == webrtc::kVideoCodecH264) {
return absl::StartsWith(trials.Lookup("WebRTC-H264Simulcast"), "Disabled");
}
return false;
}
@ -2520,10 +2515,12 @@ WebRtcVideoChannel::WebRtcVideoSendStream::CreateVideoEncoderConfig(
}
}
// Maybe limit the number of simulcast layers depending on
// `legacy_scalability_mode`, codec types (VP9/AV1) and the
// WebRTC-H264Simulcast/Disabled/ field trial.
// `legacy_scalability_mode`, codec types (VP9/AV1). This path only exists
// for backwards compatibility and will one day be deleted. If you want SVC,
// please specify with the `scalability_mode` API instead amd disabling all
// but one encoding.
if (IsCodecDisabledForSimulcast(legacy_scalability_mode,
encoder_config.codec_type, call_->trials())) {
encoder_config.codec_type)) {
encoder_config.number_of_streams = 1;
}

4
media/engine/webrtc_video_engine_unittest.cc
View File

@ -1152,9 +1152,7 @@ TEST_F(WebRtcVideoEngineTest,
ASSERT_EQ(0u, encoder_factory_->encoders().size());
}
TEST_F(WebRtcVideoEngineTest, SimulcastEnabledForH264BehindFieldTrial) {
webrtc::test::ScopedKeyValueConfig override_field_trials(
field_trials_, "WebRTC-H264Simulcast/Enabled/");
TEST_F(WebRtcVideoEngineTest, SimulcastEnabledForH264) {
AddSupportedVideoCodecType("H264");
std::unique_ptr<VideoMediaChannel> channel(engine_.CreateMediaChannel(