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

Revert "Enable Video-QualityScaling experiment by default"

Browse source 
This reverts commit 066b5b6ed7.

Reason for revert: Regressions on iOS testbots.

Original change's description:
> Enable Video-QualityScaling experiment by default
>
> Bug: webrtc:12401
> Change-Id: Iebf3130e785892bb9fddf1012bc46027a21085a4
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/204000
> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
> Reviewed-by: Åsa Persson <asapersson@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#33091}

TBR=ilnik@webrtc.org,asapersson@webrtc.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: webrtc:12401
Change-Id: I489b805c7741b63c22c16cfce03347179a3e2602
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/205001
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33123}
This commit is contained in:
Ilya Nikolaevskiy 2021-02-01 12:01:06 +00:00 committed by Commit Bot
parent 3faea70d1a
commit d6604df27f
4 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/video_coding/utility/quality_scaler_unittest.cc
View file

@ -115,7 +115,8 @@ INSTANTIATE_TEST_SUITE_P(
FieldTrials, FieldTrials,
QualityScalerTest, QualityScalerTest,
::testing::Values( ::testing::Values(
"WebRTC-Video-QualityScaling/Enabled-1,2,3,4,5,6,7,8,0.9,0.99,1/")); "WebRTC-Video-QualityScaling/Enabled-1,2,3,4,5,6,7,8,0.9,0.99,1/",
""));
TEST_P(QualityScalerTest, DownscalesAfterContinuousFramedrop) { TEST_P(QualityScalerTest, DownscalesAfterContinuousFramedrop) {
task_queue_.SendTask([this] { TriggerScale(kScaleDown); }, RTC_FROM_HERE); task_queue_.SendTask([this] { TriggerScale(kScaleDown); }, RTC_FROM_HERE);

10
rtc_base/experiments/quality_scaling_experiment.cc
View file

@ -19,8 +19,6 @@
namespace webrtc { namespace webrtc {
namespace { namespace {
constexpr char kFieldTrial[] = "WebRTC-Video-QualityScaling"; constexpr char kFieldTrial[] = "WebRTC-Video-QualityScaling";
constexpr char kDefaultQualityScalingSetttings[] =
"Enabled-29,95,149,205,24,37,26,36,0.9995,0.9999,1";
constexpr int kMinQp = 1; constexpr int kMinQp = 1;
constexpr int kMaxVp8Qp = 127; constexpr int kMaxVp8Qp = 127;
constexpr int kMaxVp9Qp = 255; constexpr int kMaxVp9Qp = 255;
@ -40,16 +38,14 @@ absl::optional<VideoEncoder::QpThresholds> GetThresholds(int low,
} // namespace } // namespace
bool QualityScalingExperiment::Enabled() { bool QualityScalingExperiment::Enabled() {
return !webrtc::field_trial::IsDisabled(kFieldTrial); return webrtc::field_trial::IsEnabled(kFieldTrial);
} }
absl::optional<QualityScalingExperiment::Settings> absl::optional<QualityScalingExperiment::Settings>
QualityScalingExperiment::ParseSettings() { QualityScalingExperiment::ParseSettings() {
std::string group = webrtc::field_trial::FindFullName(kFieldTrial); const std::string group = webrtc::field_trial::FindFullName(kFieldTrial);
// TODO(http:crbug.org/webrtc/12401): Completely remove the experiment code
// after few releases.
if (group.empty()) if (group.empty())
group = kDefaultQualityScalingSetttings; return absl::nullopt;
Settings s; Settings s;
if (sscanf(group.c_str(), "Enabled-%d,%d,%d,%d,%d,%d,%d,%d,%f,%f,%d", if (sscanf(group.c_str(), "Enabled-%d,%d,%d,%d,%d,%d,%d,%d,%f,%f,%d",

9
rtc_base/experiments/quality_scaling_experiment_unittest.cc
View file

@ -38,9 +38,9 @@ void ExpectEqualConfig(QualityScalingExperiment::Config a,
} }
} // namespace } // namespace
TEST(QualityScalingExperimentTest, DefaultEnabledWithoutFieldTrial) { TEST(QualityScalingExperimentTest, DisabledWithoutFieldTrial) {
webrtc::test::ScopedFieldTrials field_trials(""); webrtc::test::ScopedFieldTrials field_trials("");
EXPECT_TRUE(QualityScalingExperiment::Enabled()); EXPECT_FALSE(QualityScalingExperiment::Enabled());
} }
TEST(QualityScalingExperimentTest, EnabledWithFieldTrial) { TEST(QualityScalingExperimentTest, EnabledWithFieldTrial) {
@ -59,10 +59,9 @@ TEST(QualityScalingExperimentTest, ParseSettings) {
ExpectEqualSettings(kExpected, *settings); ExpectEqualSettings(kExpected, *settings);
} }
TEST(QualityScalingExperimentTest, ParseSettingsUsesDefaultsWithoutFieldTrial) { TEST(QualityScalingExperimentTest, ParseSettingsFailsWithoutFieldTrial) {
webrtc::test::ScopedFieldTrials field_trials(""); webrtc::test::ScopedFieldTrials field_trials("");
// Uses some default hard coded values. EXPECT_FALSE(QualityScalingExperiment::ParseSettings());
EXPECT_TRUE(QualityScalingExperiment::ParseSettings());
} }
TEST(QualityScalingExperimentTest, ParseSettingsFailsWithInvalidFieldTrial) { TEST(QualityScalingExperimentTest, ParseSettingsFailsWithInvalidFieldTrial) {

2
video/video_stream_encoder_unittest.cc
View file

@ -5634,8 +5634,6 @@ TEST_F(VideoStreamEncoderTest, RampsUpInQualityWhenBwIsHigh) {
TEST_F(VideoStreamEncoderTest, TEST_F(VideoStreamEncoderTest,
QualityScalerAdaptationsRemovedWhenQualityScalingDisabled) { QualityScalerAdaptationsRemovedWhenQualityScalingDisabled) {
webrtc::test::ScopedFieldTrials field_trials(
"WebRTC-Video-QualityScaling/Disabled/");
AdaptingFrameForwarder source(&time_controller_); AdaptingFrameForwarder source(&time_controller_);
source.set_adaptation_enabled(true); source.set_adaptation_enabled(true);
video_stream_encoder_->SetSource(&source, video_stream_encoder_->SetSource(&source,