zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ability to configure quality scaler settings through field trial.

Browse Source 
optional<int> min_frames: The minimum number frames to observe to make a
                          scaling decision.
Default: kMinFramesNeededToScale in quality_scaler.cc

optional<double> initial_scale_factor: The sample period scale factor.
Default: kSamplePeriodScaleFactor in quality_scaler.cc

optional<double> scale_factor: Option to use a reduced sampling interval when
                               last check did not result in an adaptation (if
                               unset the initial_scale_factor is used).

Bug: none
Change-Id: I3bb955d1f8d7d7d49bc118361614b5aa59605231
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/135125
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27860}
This commit is contained in:
Åsa Persson
2019-05-06 14:17:35 +02:00
committed by Commit Bot
parent cfff652c82
commit 517678cc49
7 changed files with 222 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
rtc_base/experiments/quality_scaler_settings_unittest.cc Normal file
View File

@ -0,0 +1,76 @@
/*
* Copyright 2019 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "rtc_base/experiments/quality_scaler_settings.h"
#include "test/field_trial.h"
#include "test/gtest.h"
namespace webrtc {
namespace {
TEST(QualityScalerSettingsTest, ValuesNotSetByDefault) {
EXPECT_FALSE(QualityScalerSettings::ParseFromFieldTrials().MinFrames());
EXPECT_FALSE(
QualityScalerSettings::ParseFromFieldTrials().InitialScaleFactor());
EXPECT_FALSE(QualityScalerSettings::ParseFromFieldTrials().ScaleFactor());
}
TEST(QualityScalerSettingsTest, ParseMinFrames) {
test::ScopedFieldTrials field_trials(
"WebRTC-Video-QualityScalerSettings/min_frames:100/");
EXPECT_EQ(100, QualityScalerSettings::ParseFromFieldTrials().MinFrames());
}
TEST(QualityScalerSettingsTest, ParseInitialScaleFactor) {
test::ScopedFieldTrials field_trials(
"WebRTC-Video-QualityScalerSettings/initial_scale_factor:1.5/");
EXPECT_EQ(1.5,
QualityScalerSettings::ParseFromFieldTrials().InitialScaleFactor());
}
TEST(QualityScalerSettingsTest, ParseScaleFactor) {
test::ScopedFieldTrials field_trials(
"WebRTC-Video-QualityScalerSettings/scale_factor:1.1/");
EXPECT_EQ(1.1, QualityScalerSettings::ParseFromFieldTrials().ScaleFactor());
}
TEST(QualityScalerSettingsTest, ParseAll) {
test::ScopedFieldTrials field_trials(
"WebRTC-Video-QualityScalerSettings/"
"min_frames:100,initial_scale_factor:1.5,scale_factor:0.9/");
const auto settings = QualityScalerSettings::ParseFromFieldTrials();
EXPECT_EQ(100, settings.MinFrames());
EXPECT_EQ(1.5, settings.InitialScaleFactor());
EXPECT_EQ(0.9, settings.ScaleFactor());
}
TEST(QualityScalerSettingsTest, DoesNotParseIncorrectValue) {
test::ScopedFieldTrials field_trials(
"WebRTC-Video-QualityScalerSettings/"
"min_frames:a,initial_scale_factor:b,scale_factor:c/");
const auto settings = QualityScalerSettings::ParseFromFieldTrials();
EXPECT_FALSE(settings.MinFrames());
EXPECT_FALSE(settings.InitialScaleFactor());
EXPECT_FALSE(settings.ScaleFactor());
}
TEST(QualityScalerSettingsTest, DoesNotReturnTooSmallValue) {
test::ScopedFieldTrials field_trials(
"WebRTC-Video-QualityScalerSettings/"
"min_frames:0,initial_scale_factor:0.0,scale_factor:0.0/");
const auto settings = QualityScalerSettings::ParseFromFieldTrials();
EXPECT_FALSE(settings.MinFrames());
EXPECT_FALSE(settings.InitialScaleFactor());
EXPECT_FALSE(settings.ScaleFactor());
}
} // namespace
} // namespace webrtc