commit bc1cdef4e8707b8b30a32b27a44513a72fa4dfc4
author Åsa Persson <asapersson@webrtc.org> Thu Feb 11 13:17:06 2021
committer Commit Bot <commit-bot@chromium.org> Fri Feb 12 14:49:28 2021
tree 1b141420a83f398581e1c9130d9320c35eaae29b
parent 27bc6e224696b1be26deca032578623ac34f72cb

EncoderInfoSettings: Add common string which applies to all encoders.

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}

modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc

diff --git a/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc b/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc
index 005eda63..4ffcf13 100644
--- a/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc
+++ b/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc
@@ -1698,7 +1698,7 @@
 
 TEST_F(TestVp9Impl, EncoderInfoWithBitrateLimitsFromFieldTrial) {
   test::ScopedFieldTrials field_trials(
-      "WebRTC-LibvpxVp9Encoder-GetEncoderInfoOverride/"
+      "WebRTC-VP9-GetEncoderInfoOverride/"
       "frame_size_pixels:123|456|789,"
       "min_start_bitrate_bps:11000|22000|33000,"
       "min_bitrate_bps:44000|55000|66000,"

rtc_base/experiments/encoder_info_settings.cc

diff --git a/rtc_base/experiments/encoder_info_settings.cc b/rtc_base/experiments/encoder_info_settings.cc
index eb6d0dd..a952c05 100644
--- a/rtc_base/experiments/encoder_info_settings.cc
+++ b/rtc_base/experiments/encoder_info_settings.cc
@@ -51,6 +51,11 @@
            [](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_,
                    &apply_alignment_to_all_simulcast_layers_},
                   field_trial::FindFullName(name));
@@ -79,6 +84,6 @@
     : EncoderInfoSettings("WebRTC-VP8-GetEncoderInfoOverride") {}
 
 LibvpxVp9EncoderInfoSettings::LibvpxVp9EncoderInfoSettings()
-    : EncoderInfoSettings("WebRTC-LibvpxVp9Encoder-GetEncoderInfoOverride") {}
+    : EncoderInfoSettings("WebRTC-VP9-GetEncoderInfoOverride") {}
 
 }  // namespace webrtc

rtc_base/experiments/encoder_info_settings_unittest.cc

diff --git a/rtc_base/experiments/encoder_info_settings_unittest.cc b/rtc_base/experiments/encoder_info_settings_unittest.cc
index 0208c0d..aabb687 100644
--- a/rtc_base/experiments/encoder_info_settings_unittest.cc
+++ b/rtc_base/experiments/encoder_info_settings_unittest.cc
@@ -88,4 +88,15 @@
           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