mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-12 21:30:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove WebRTC-BoostedScreenshareQp

Browse source 
Bug: b/42234864, b/337757868
Change-Id: Iad1a6ec4833868e3a8b60d85847c2d2367fefb88
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/349720
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42224}
This commit is contained in:
Sergey Silkin 2024-05-03 10:07:05 +00:00 committed by WebRTC LUCI CQ
parent 8a5f807313
commit 5ed460aa31
3 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
experiments/field_trials.py
View file

@ -490,9 +490,6 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
FieldTrial('WebRTC-BindUsingInterfaceName',
42220770,
date(2024, 4, 1)),
FieldTrial('WebRTC-BoostedScreenshareQp',
42234864,
date(2024, 4, 1)),
FieldTrial('WebRTC-Bwe-AllocationProbing',
42220440,
date(2024, 4, 1)),
@ -890,7 +887,7 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
]) # yapf: disable
POLICY_EXEMPT_FIELD_TRIALS_DIGEST: str = \
'f74a8c7f29f03ef83154393d0a7ea0b7258d7441'
'230533dd083ddb73124412b928105b4c2ef3c1e9'
REGISTERED_FIELD_TRIALS: FrozenSet[FieldTrial] = ACTIVE_FIELD_TRIALS.union(
POLICY_EXEMPT_FIELD_TRIALS)

21
media/engine/simulcast_encoder_adapter.cc
View file

@ -44,18 +44,6 @@ namespace {
// Max qp for lowest spatial resolution when doing simulcast.
const unsigned int kLowestResMaxQp = 45;
absl::optional<unsigned int> GetScreenshareBoostedQpValue(
const webrtc::FieldTrialsView& field_trials) {
std::string experiment_group =
field_trials.Lookup("WebRTC-BoostedScreenshareQp");
unsigned int qp;
if (sscanf(experiment_group.c_str(), "%u", &qp) != 1)
return absl::nullopt;
qp = std::min(qp, 63u);
qp = std::max(qp, 1u);
return qp;
}
uint32_t SumStreamMaxBitrate(int streams, const webrtc::VideoCodec& codec) {
uint32_t bitrate_sum = 0;
for (int i = 0; i < streams; ++i) {
@ -258,8 +246,6 @@ SimulcastEncoderAdapter::SimulcastEncoderAdapter(
total_streams_count_(0),
bypass_mode_(false),
encoded_complete_callback_(nullptr),
experimental_boosted_screenshare_qp_(
GetScreenshareBoostedQpValue(env_.field_trials())),
boost_base_layer_quality_(
RateControlSettings::ParseFromKeyValueConfig(&env_.field_trials())
.Vp8BoostBaseLayerQuality()),
@ -825,11 +811,8 @@ webrtc::VideoCodec SimulcastEncoderAdapter::MakeStreamCodec(
// Settings that are based on stream/resolution.
if (is_lowest_quality_stream) {
// Settings for lowest spatial resolutions.
if (codec.mode == VideoCodecMode::kScreensharing) {
if (experimental_boosted_screenshare_qp_) {
codec_params.qpMax = *experimental_boosted_screenshare_qp_;
}
} else if (boost_base_layer_quality_) {
if (codec.mode == VideoCodecMode::kRealtimeVideo &&
boost_base_layer_quality_) {
codec_params.qpMax = kLowestResMaxQp;
}
}

1
media/engine/simulcast_encoder_adapter.h
View file

@ -189,7 +189,6 @@ class RTC_EXPORT SimulcastEncoderAdapter : public VideoEncoder {
// GetEncoderInfo(), which is const.
mutable std::list<std::unique_ptr<EncoderContext>> cached_encoder_contexts_;
const absl::optional<unsigned int> experimental_boosted_screenshare_qp_;
const bool boost_base_layer_quality_;
const bool prefer_temporal_support_on_base_layer_;
const bool per_layer_pli_;