Add a new frame generator that cycles through randomly generated slides.

webrtc/video/full_stack_tests.cc

 /*
  *  Copyright (c) 2013 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 <stdio.h>
@@ skipping 324 matching lines @@
   conf_motion_hd.pipe.link_capacity_kbps = 2000;
   RunTest(conf_motion_hd);
 }
 #endif
 
 TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL) {
   VideoQualityTest::Params screenshare;
   screenshare.call.send_side_bwe = true;
   screenshare.video = {true,  1850, 1110, 5,      50000, 200000, 2000000, false,
                        "VP8", 2,    1,    400000, false, false,  ""};
-  screenshare.screenshare = {true, 10};
+  screenshare.screenshare = {true, false, 10};
   screenshare.analyzer = {"screenshare_slides", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   RunTest(screenshare);
 }
 
+TEST_F(FullStackTest, ScreenshareGenSlidesVP8_2TL) {
+  VideoQualityTest::Params screenshare;
+  screenshare.call.send_side_bwe = true;
+  screenshare.video = {true,  1850, 1110, 5,      50000, 200000, 2000000, false,
+                       "VP8", 2,    1,    400000, false, false,  ""};
+  screenshare.screenshare = {true, true, 10};
+  screenshare.analyzer = {"screenshare_gen_slides", 0.0, 0.0,
+                          kFullStackTestDurationSecs};
+  RunTest(screenshare);
+}
+
+const VideoQualityTest::Params::Video kSimulcastScreenshareVp8VideoLow = {
+  true,    1850,    1110,  5,     800000,
+  2500000, 2500000, false, "VP8", 3,
+  0,       400000,  false, false, ""};
+
+const VideoQualityTest::Params::Video kSimulcastScreenshareVp8VideoHigh = {
+  true,   1850,    1110,  5,     50000,
+  200000, 2000000, false, "VP8", 2,
+  0,      400000,  false, false, ""};
+

[sprang_webrtc, 2017/08/23 12:59:24]

What's the purpose of these tests? We're a little hesitant to add too many tests
here as they tend to be rather timing sensitive and may cause unnecessary burden
for perf sheriffs.

[erikvarga1, 2017/08/23 14:41:25]

I added these to have some integration tests where the new generator is used,
but I guess the perf tests aren't really the best place for this.
I've removed them and instead added an option to choose between generators in
the screenshare_loopback.

 TEST_F(FullStackTest, ScreenshareSlidesVP8_3TL_Simulcast) {
   test::ScopedFieldTrials field_trial(kScreenshareSimulcastExperiment);
   VideoQualityTest::Params screenshare;
   screenshare.call.send_side_bwe = true;
-  screenshare.screenshare = {true, 10};
+  screenshare.screenshare = {true, false, 10};
   screenshare.video = {true,    1850,    1110,  5,     800000,
                        2500000, 2500000, false, "VP8", 3,
                        2,       400000,  false, false, ""};
   screenshare.analyzer = {"screenshare_slides_simulcast", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   VideoQualityTest::Params screenshare_params_high;
-  screenshare_params_high.video = {true,    1850,    1110,  5,     800000,
-                                   2500000, 2500000, false, "VP8", 3,
-                                   0,       400000,  false, false, ""};
+  screenshare_params_high.video = kSimulcastScreenshareVp8VideoLow;
   VideoQualityTest::Params screenshare_params_low;
-  screenshare_params_low.video = {true,   1850,    1110,  5,     50000,
-                                  200000, 2000000, false, "VP8", 2,
-                                  0,      400000,  false, false, ""};
+  screenshare_params_low.video = kSimulcastScreenshareVp8VideoHigh;
 
   std::vector<VideoStream> streams = {
       DefaultVideoStream(screenshare_params_low),
+      DefaultVideoStream(screenshare_params_high)};
+  screenshare.ss = {streams, 1, 1, 0, std::vector<SpatialLayer>(), false};
+  RunTest(screenshare);
+}
+
+TEST_F(FullStackTest, ScreenshareGenSlidesVP8_3TL_Simulcast) {
+  test::ScopedFieldTrials field_trial(kScreenshareSimulcastExperiment);
+  VideoQualityTest::Params screenshare;
+  screenshare.call.send_side_bwe = true;
+  screenshare.screenshare = {true, true, 10};
+  screenshare.video = {true,    1850,    1110,  5,     800000,
+                       2500000, 2500000, false, "VP8", 3,
+                       2,       400000,  false, false, ""};
+  screenshare.analyzer = {"screenshare_gen_slides_simulcast", 0.0, 0.0,
+                          kFullStackTestDurationSecs};
+  VideoQualityTest::Params screenshare_params_high;
+  screenshare_params_high.video = kSimulcastScreenshareVp8VideoLow;
+  VideoQualityTest::Params screenshare_params_low;
+  screenshare_params_low.video = kSimulcastScreenshareVp8VideoHigh;
+
+  std::vector<VideoStream> streams = {
+      DefaultVideoStream(screenshare_params_low),
       DefaultVideoStream(screenshare_params_high)};
   screenshare.ss = {streams, 1, 1, 0, std::vector<SpatialLayer>(), false};
   RunTest(screenshare);
 }
 
 TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Scroll) {
   VideoQualityTest::Params config;
   config.call.send_side_bwe = true;
   config.video = {true,  1850, 1110 / 2, 5,      50000, 200000, 2000000, false,
                   "VP8", 2,    1,        400000, false, false,  ""};
-  config.screenshare = {true, 10, 2};
+  config.screenshare = {true, false, 10, 2};
   config.analyzer = {"screenshare_slides_scrolling", 0.0, 0.0,
                      kFullStackTestDurationSecs};
   RunTest(config);
 }
 
 TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_LossyNet) {
   VideoQualityTest::Params screenshare;
   screenshare.call.send_side_bwe = true;
   screenshare.video = {true,  1850, 1110, 5,      50000, 200000, 2000000, false,
                        "VP8", 2,    1,    400000, false, false,  ""};
-  screenshare.screenshare = {true, 10};
+  screenshare.screenshare = {true, false, 10};
   screenshare.analyzer = {"screenshare_slides_lossy_net", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   screenshare.pipe.loss_percent = 5;
   screenshare.pipe.queue_delay_ms = 200;
   screenshare.pipe.link_capacity_kbps = 500;
   RunTest(screenshare);
 }
 
 TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_VeryLossyNet) {
   VideoQualityTest::Params screenshare;
   screenshare.call.send_side_bwe = true;
   screenshare.video = {true,  1850, 1110, 5,      50000, 200000, 2000000, false,
                        "VP8", 2,    1,    400000, false, false,  ""};
-  screenshare.screenshare = {true, 10};
+  screenshare.screenshare = {true, false, 10};
   screenshare.analyzer = {"screenshare_slides_very_lossy", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   screenshare.pipe.loss_percent = 10;
   screenshare.pipe.queue_delay_ms = 200;
   screenshare.pipe.link_capacity_kbps = 500;
   RunTest(screenshare);
 }
 
 TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_LossyNetRestrictedQueue) {
   VideoQualityTest::Params screenshare;
   screenshare.call.send_side_bwe = true;
   screenshare.video = {true,  1850, 1110, 5,      50000, 200000, 2000000, false,
                        "VP8", 2,    1,    400000, false, false,  ""};
-  screenshare.screenshare = {true, 10};
+  screenshare.screenshare = {true, false, 10};
   screenshare.analyzer = {"screenshare_slides_lossy_limited", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   screenshare.pipe.loss_percent = 5;
   screenshare.pipe.link_capacity_kbps = 200;
   screenshare.pipe.queue_length_packets = 30;
 
   RunTest(screenshare);
 }
 
 TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_ModeratelyRestricted) {
   VideoQualityTest::Params screenshare;
   screenshare.call.send_side_bwe = true;
   screenshare.video = {true,  1850, 1110, 5,      50000, 200000, 2000000, false,
                        "VP8", 2,    1,    400000, false, false,  ""};
-  screenshare.screenshare = {true, 10};
+  screenshare.screenshare = {true, false, 10};
   screenshare.analyzer = {"screenshare_slides_moderately_restricted", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   screenshare.pipe.loss_percent = 1;
   screenshare.pipe.link_capacity_kbps = 1200;
   screenshare.pipe.queue_length_packets = 30;
 
   RunTest(screenshare);
 }
 
 // TODO(sprang): Retire these tests once experiment is removed.
 TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_LossyNetRestrictedQueue_ALR) {
   test::ScopedFieldTrials field_trial(kAlrProbingExperiment);
   VideoQualityTest::Params screenshare;
   screenshare.call.send_side_bwe = true;
   screenshare.video = {true,  1850, 1110, 5,      50000, 200000, 2000000, false,
                        "VP8", 2,    1,    400000, false, false,  ""};
-  screenshare.screenshare = {true, 10};
+  screenshare.screenshare = {true, false, 10};
   screenshare.analyzer = {"screenshare_slides_lossy_limited_ALR", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   screenshare.pipe.loss_percent = 5;
   screenshare.pipe.link_capacity_kbps = 200;
   screenshare.pipe.queue_length_packets = 30;
 
   RunTest(screenshare);
 }
 
 TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_ALR) {
   test::ScopedFieldTrials field_trial(kAlrProbingExperiment);
   VideoQualityTest::Params screenshare;
   screenshare.call.send_side_bwe = true;
   screenshare.video = {true,  1850, 1110, 5,      50000, 200000, 2000000, false,
                        "VP8", 2,    1,    400000, false, false,  ""};
-  screenshare.screenshare = {true, 10};
+  screenshare.screenshare = {true, false, 10};
   screenshare.analyzer = {"screenshare_slides_ALR", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   RunTest(screenshare);
 }
 
 TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_ModeratelyRestricted_ALR) {
   test::ScopedFieldTrials field_trial(kAlrProbingExperiment);
   VideoQualityTest::Params screenshare;
   screenshare.call.send_side_bwe = true;
   screenshare.video = {true,  1850, 1110, 5,      50000, 200000, 2000000, false,
                        "VP8", 2,    1,    400000, false, false,  ""};
-  screenshare.screenshare = {true, 10};
+  screenshare.screenshare = {true, false, 10};
   screenshare.analyzer = {"screenshare_slides_moderately_restricted_ALR", 0.0,
                           0.0, kFullStackTestDurationSecs};
   screenshare.pipe.loss_percent = 1;
   screenshare.pipe.link_capacity_kbps = 1200;
   screenshare.pipe.queue_length_packets = 30;
 
   RunTest(screenshare);
 }
 
 TEST_F(FullStackTest, ScreenshareSlidesVP8_3TL_Simulcast_ALR) {
   test::ScopedFieldTrials field_trial(kScreenshareSimulcastExperiment +
                                       kAlrProbingExperiment);
   VideoQualityTest::Params screenshare;
   screenshare.call.send_side_bwe = true;
-  screenshare.screenshare = {true, 10};
+  screenshare.screenshare = {true, false, 10};
   screenshare.video = {true,    1850,    1110,  5,     800000,
                        2500000, 2500000, false, "VP8", 3,
                        2,       400000,  false, false, ""};
   screenshare.analyzer = {"screenshare_slides_simulcast_alr", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   VideoQualityTest::Params screenshare_params_high;
   screenshare_params_high.video = {true,    1850,    1110,  5,     800000,
                                    2500000, 2500000, false, "VP8", 3,
                                    0,       400000,  false, false, ""};
   VideoQualityTest::Params screenshare_params_low;
@@ skipping 27 matching lines @@
     true,   320,    180,   30,    30000,
     150000, 200000, false, "VP8", 3,
     2,      400000, false, false, "ConferenceMotion_1280_720_50"};
 
 #if !defined(RTC_DISABLE_VP9)
 TEST_F(FullStackTest, ScreenshareSlidesVP9_2SL) {
   VideoQualityTest::Params screenshare;
   screenshare.call.send_side_bwe = true;
   screenshare.video = {true,  1850, 1110, 5,      50000, 200000, 2000000, false,
                        "VP9", 1,    0,    400000, false, false,  ""};
-  screenshare.screenshare = {true, 10};
+  screenshare.screenshare = {true, false, 10};
   screenshare.analyzer = {"screenshare_slides_vp9_2sl", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   screenshare.ss = {std::vector<VideoStream>(),  0,    2, 1,
                     std::vector<SpatialLayer>(), false};
   RunTest(screenshare);
 }
 
 TEST_F(FullStackTest, VP9SVC_3SL_High) {
   VideoQualityTest::Params simulcast;
   simulcast.call.send_side_bwe = true;
@@ skipping 193 matching lines @@
   std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low),
                                       DefaultVideoStream(video_params_medium),
                                       DefaultVideoStream(video_params_high)};
   large_room.call.num_thumbnails = 50;
   large_room.ss = {streams, 2, 1, 0, std::vector<SpatialLayer>(), false};
   RunTest(large_room);
 }
 
 
 }  // namespace webrtc