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

EncoderInfoSettings: Add common string which applies to all encoders.

Browse source 
Change "-LibvpxVp9Encoder-" to "-VP9-" for consistency.

Bug: none
Change-Id: I7a73759db00e92286fe9a4bbed8512baf91decdb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/206982
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33249}
This commit is contained in:
Åsa Persson 2021-02-11 14:17:06 +01:00 committed by Commit Bot
parent 27bc6e2246
commit bc1cdef4e8
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc
View file

@ -1698,7 +1698,7 @@ TEST_F(TestVp9Impl, EncoderInfoWithoutResolutionBitrateLimits) {
TEST_F(TestVp9Impl, EncoderInfoWithBitrateLimitsFromFieldTrial) { TEST_F(TestVp9Impl, EncoderInfoWithBitrateLimitsFromFieldTrial) {
test::ScopedFieldTrials field_trials( test::ScopedFieldTrials field_trials(
"WebRTC-LibvpxVp9Encoder-GetEncoderInfoOverride/" "WebRTC-VP9-GetEncoderInfoOverride/"
"frame_size_pixels:123|456|789," "frame_size_pixels:123|456|789,"
"min_start_bitrate_bps:11000|22000|33000," "min_start_bitrate_bps:11000|22000|33000,"
"min_bitrate_bps:44000|55000|66000," "min_bitrate_bps:44000|55000|66000,"

7
rtc_base/experiments/encoder_info_settings.cc
View file

@ -51,6 +51,11 @@ EncoderInfoSettings::EncoderInfoSettings(std::string name)
[](BitrateLimit* b) { return &b->max_bitrate_bps; })}, [](BitrateLimit* b) { return &b->max_bitrate_bps; })},
{}); {});
if (field_trial::FindFullName(name).empty()) {
// Encoder name not found, use common string applying to all encoders.
name = "WebRTC-GetEncoderInfoOverride";
}
ParseFieldTrial({&bitrate_limits, &requested_resolution_alignment_, ParseFieldTrial({&bitrate_limits, &requested_resolution_alignment_,
&apply_alignment_to_all_simulcast_layers_}, &apply_alignment_to_all_simulcast_layers_},
field_trial::FindFullName(name)); field_trial::FindFullName(name));
@ -79,6 +84,6 @@ LibvpxVp8EncoderInfoSettings::LibvpxVp8EncoderInfoSettings()
: EncoderInfoSettings("WebRTC-VP8-GetEncoderInfoOverride") {} : EncoderInfoSettings("WebRTC-VP8-GetEncoderInfoOverride") {}
LibvpxVp9EncoderInfoSettings::LibvpxVp9EncoderInfoSettings() LibvpxVp9EncoderInfoSettings::LibvpxVp9EncoderInfoSettings()
: EncoderInfoSettings("WebRTC-LibvpxVp9Encoder-GetEncoderInfoOverride") {} : EncoderInfoSettings("WebRTC-VP9-GetEncoderInfoOverride") {}
} // namespace webrtc } // namespace webrtc

11
rtc_base/experiments/encoder_info_settings_unittest.cc
View file

@ -88,4 +88,15 @@ TEST(SimulcastEncoderAdapterSettingsTest, GetResolutionBitrateLimitsWithList) {
VideoEncoder::ResolutionBitrateLimits{789, 33000, 66000, 99000})); VideoEncoder::ResolutionBitrateLimits{789, 33000, 66000, 99000}));
} }
TEST(EncoderSettingsTest, CommonSettingsUsedIfEncoderNameUnspecified) {
webrtc::test::ScopedFieldTrials field_trials(
"WebRTC-VP8-GetEncoderInfoOverride/requested_resolution_alignment:2/"
"WebRTC-GetEncoderInfoOverride/requested_resolution_alignment:3/");
LibvpxVp8EncoderInfoSettings vp8_settings;
EXPECT_EQ(2, vp8_settings.requested_resolution_alignment());
LibvpxVp9EncoderInfoSettings vp9_settings;
EXPECT_EQ(3, vp9_settings.requested_resolution_alignment());
}
} // namespace webrtc } // namespace webrtc