Cleaning up full-stack simulcast tests and making them more realistic.

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 329 matching lines @@
                        "VP8", 2, 1, 400000, false, false, "", ""};
   screenshare.screenshare = {true, 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);
 }
 
+const VideoQualityTest::Params::Video kSimulcastVP9Video = {

[sprang_webrtc, 2017/03/06 17:18:30]

s/Simulcast/Svc

[ilnik, 2017/03/07 09:32:13]

Done.

+    true,   1280,    720,     30,
+    800000, 2500000, 2500000, false,
+    "VP9",  3,       2,       400000,
+    false,  false,   "",      "ConferenceMotion_1280_720_50"};
+
+const VideoQualityTest::Params::Video kSimulcastVP8VideoHigh = {
+    true,   1280,    720,     30,
+    800000, 2500000, 2500000, false,
+    "VP8",  3,       2,       400000,
+    false,  false,   "",      "ConferenceMotion_1280_720_50"};
+
+const VideoQualityTest::Params::Video kSimulcastVP8VideoMedium = {
+    true,   640,    360,    30,
+    150000, 500000, 700000, false,
+    "VP8",  3,      2,      400000,
+    false,  false,  "",     "ConferenceMotion_1280_720_50"};
+
+const VideoQualityTest::Params::Video kSimulcastVP8VideoLow = {
+    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.analyzer = {"screenshare_slides_vp9_2sl", 0.0, 0.0,
                           kFullStackTestDurationSecs};
   screenshare.logs = false;
   screenshare.ss = {std::vector<VideoStream>(), 0, 2, 1};
   RunTest(screenshare);
 }
 
 TEST_F(FullStackTest, VP9SVC_3SL_High) {
   VideoQualityTest::Params simulcast;
   simulcast.call.send_side_bwe = true;
-  simulcast.video = {true,   1280,    720,     30,
-                     800000, 2500000, 2500000, false,
-                     "VP9",  1,       0,       400000,
-                     false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  simulcast.video = kSimulcastVP9Video;
   simulcast.analyzer = {"vp9svc_3sl_high", 0.0, 0.0,
                         kFullStackTestDurationSecs};
   simulcast.logs = false;
   simulcast.ss = {std::vector<VideoStream>(), 0, 3, 2};
   RunTest(simulcast);
 }
 
 TEST_F(FullStackTest, VP9SVC_3SL_Medium) {
   VideoQualityTest::Params simulcast;
   simulcast.call.send_side_bwe = true;
-  simulcast.video = {true,   1280,    720,     30,
-                     800000, 2500000, 2500000, false,
-                     "VP9",  1,       0,       400000,
-                     false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  simulcast.video = kSimulcastVP9Video;
   simulcast.analyzer = {"vp9svc_3sl_medium", 0.0, 0.0,
                         kFullStackTestDurationSecs};
   simulcast.logs = false;
   simulcast.ss = {std::vector<VideoStream>(), 0, 3, 1};
   RunTest(simulcast);
 }
 
 TEST_F(FullStackTest, VP9SVC_3SL_Low) {
   VideoQualityTest::Params simulcast;
   simulcast.call.send_side_bwe = true;
-  simulcast.video = {true,   1280,    720,     30,
-                     800000, 2500000, 2500000, false,
-                     "VP9",  1,       0,       400000,
-                     false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  simulcast.video = kSimulcastVP9Video;
   simulcast.analyzer = {"vp9svc_3sl_low", 0.0, 0.0, kFullStackTestDurationSecs};
   simulcast.logs = false;
   simulcast.ss = {std::vector<VideoStream>(), 0, 3, 0};
   RunTest(simulcast);
 }
 #endif  // !defined(RTC_DISABLE_VP9)
 
 TEST_F(FullStackTest, SimulcastVP8_3SL_High) {
   VideoQualityTest::Params simulcast;
   simulcast.call.send_side_bwe = true;
-  simulcast.video = {true,   1280,    720,     30,
-                     800000, 2500000, 2500000, false,
-                     "VP8",  1,       0,       400000,
-                     false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  simulcast.video = kSimulcastVP8VideoHigh;
   simulcast.analyzer = {"simulcast_vp8_3sl_high", 0.0, 0.0,
                         kFullStackTestDurationSecs};
   simulcast.pipe.loss_percent = 0;
   simulcast.pipe.queue_delay_ms = 100;
   VideoQualityTest::Params video_params_high;
-  video_params_high.video = {
-      true,   1280,    720,     30,
-      800000, 2500000, 2500000, false,
-      "VP8",  1,       0,       400000,
-      false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  video_params_high.video = kSimulcastVP8VideoHigh;
   VideoQualityTest::Params video_params_medium;
-  video_params_medium.video = {
-      true,   640,    360,    30,
-      150000, 500000, 700000, false,
-      "VP8",  1,      0,      400000,
-      false,  false,  "",     "ConferenceMotion_1280_720_50"};
+  video_params_medium.video = kSimulcastVP8VideoMedium;
   VideoQualityTest::Params video_params_low;
-  video_params_low.video = {
-      true,  320,    180,    30,
-      30000, 150000, 200000, false,
-      "VP8", 1,      0,      400000,
-      false, false,  "",     "ConferenceMotion_1280_720_50"};
+  video_params_low.video = kSimulcastVP8VideoLow;
 
   std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low),
                                       DefaultVideoStream(video_params_medium),
                                       DefaultVideoStream(video_params_high)};
   simulcast.ss = {streams, 2, 1, 0};
   RunTest(simulcast);
 }
 
 TEST_F(FullStackTest, SimulcastVP8_3SL_Medium) {
   VideoQualityTest::Params simulcast;
   simulcast.call.send_side_bwe = true;
-  simulcast.video = {true,   1280,    720,     30,
-                     800000, 2500000, 2500000, false,
-                     "VP8",  1,       0,       400000,
-                     false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  simulcast.video = kSimulcastVP8VideoHigh;
   simulcast.analyzer = {"simulcast_vp8_3sl_medium", 0.0, 0.0,
                         kFullStackTestDurationSecs};
   simulcast.pipe.loss_percent = 0;
   simulcast.pipe.queue_delay_ms = 100;
   VideoQualityTest::Params video_params_high;
-  video_params_high.video = {
-      true,   1280,    720,     30,
-      800000, 2500000, 2500000, false,
-      "VP8",  1,       0,       400000,
-      false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  video_params_high.video = kSimulcastVP8VideoHigh;
   VideoQualityTest::Params video_params_medium;
-  video_params_medium.video = {
-      true,   640,    360,    30,
-      150000, 500000, 700000, false,
-      "VP8",  1,      0,      400000,
-      false,  false,  "",     "ConferenceMotion_1280_720_50"};
+  video_params_medium.video = kSimulcastVP8VideoMedium;
   VideoQualityTest::Params video_params_low;
-  video_params_low.video = {
-      true,  320,    180,    30,
-      30000, 150000, 200000, false,
-      "VP8", 1,      0,      400000,
-      false, false,  "",     "ConferenceMotion_1280_720_50"};
+  video_params_low.video = kSimulcastVP8VideoLow;
 
   std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low),
                                       DefaultVideoStream(video_params_medium),
                                       DefaultVideoStream(video_params_high)};
   simulcast.ss = {streams, 1, 1, 0};
   RunTest(simulcast);
 }
 
 TEST_F(FullStackTest, SimulcastVP8_3SL_Low) {
   VideoQualityTest::Params simulcast;
   simulcast.call.send_side_bwe = true;
-  simulcast.video = {true,   1280,    720,     30,
-                     800000, 2500000, 2500000, false,
-                     "VP8",  1,       0,       400000,
-                     false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  simulcast.video = kSimulcastVP8VideoHigh;
   simulcast.analyzer = {"simulcast_vp8_3sl_low", 0.0, 0.0,
                         kFullStackTestDurationSecs};
   simulcast.pipe.loss_percent = 0;
   simulcast.pipe.queue_delay_ms = 100;
   VideoQualityTest::Params video_params_high;
-  video_params_high.video = {
-      true,   1280,    720,     30,
-      800000, 2500000, 2500000, false,
-      "VP8",  1,       0,       400000,
-      false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  video_params_high.video = kSimulcastVP8VideoHigh;
   VideoQualityTest::Params video_params_medium;
-  video_params_medium.video = {
-      true,   640,    360,    30,
-      150000, 500000, 700000, false,
-      "VP8",  1,      0,      400000,
-      false,  false,  "",     "ConferenceMotion_1280_720_50"};
+  video_params_medium.video = kSimulcastVP8VideoMedium;
   VideoQualityTest::Params video_params_low;
-  video_params_low.video = {
-      true,  320,    180,    30,
-      30000, 150000, 200000, false,
-      "VP8", 1,      0,      400000,
-      false, false,  "",     "ConferenceMotion_1280_720_50"};
+  video_params_low.video = kSimulcastVP8VideoLow;
 
   std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low),
                                       DefaultVideoStream(video_params_medium),
                                       DefaultVideoStream(video_params_high)};
   simulcast.ss = {streams, 0, 1, 0};
   RunTest(simulcast);
 }
 
 TEST_F(FullStackTest, LargeRoomVP8_5thumb) {
   VideoQualityTest::Params large_room;
   large_room.call.send_side_bwe = true;
-  large_room.video = {true,   1280,    720,     30,
-                      800000, 2500000, 2500000, false,
-                      "VP8",  3,       2,       400000,
-                      false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  large_room.video = kSimulcastVP8VideoHigh;
   large_room.analyzer = {"largeroom_5thumb", 0.0, 0.0,
                          kFullStackTestDurationSecs};
   large_room.pipe.loss_percent = 0;
   large_room.pipe.queue_delay_ms = 100;
   VideoQualityTest::Params video_params_high;
-  video_params_high.video = {
-      true,   1280,    720,     30,
-      800000, 2500000, 2500000, false,
-      "VP8",  3,       2,       400000,
-      false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  video_params_high.video = kSimulcastVP8VideoHigh;
   VideoQualityTest::Params video_params_medium;
-  video_params_medium.video = {
-      true,   640,    360,    30,
-      150000, 500000, 700000, false,
-      "VP8",  3,      2,      400000,
-      false,  false,  "",     "ConferenceMotion_1280_720_50"};
+  video_params_medium.video = kSimulcastVP8VideoMedium;
   VideoQualityTest::Params video_params_low;
-  video_params_low.video = {
-      true,  320,    180,    30,
-      30000, 150000, 200000, false,
-      "VP8", 3,      2,      400000,
-      false, false,  "",     "ConferenceMotion_1280_720_50"};
+  video_params_low.video = kSimulcastVP8VideoLow;
 
   std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low),
                                       DefaultVideoStream(video_params_medium),
                                       DefaultVideoStream(video_params_high)};
   large_room.num_thumbnails = 5;
   large_room.ss = {streams, 2, 1, 0};
   RunTest(large_room);
 }
 
 TEST_F(FullStackTest, LargeRoomVP8_15thumb) {
   VideoQualityTest::Params large_room;
   large_room.call.send_side_bwe = true;
-  large_room.video = {true,   1280,    720,     30,
-                      800000, 2500000, 2500000, false,
-                      "VP8",  3,       2,       400000,
-                      false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  large_room.video = kSimulcastVP8VideoHigh;
   large_room.analyzer = {"largeroom_15thumb", 0.0, 0.0,
                          kFullStackTestDurationSecs};
   large_room.pipe.loss_percent = 0;
   large_room.pipe.queue_delay_ms = 100;
   VideoQualityTest::Params video_params_high;
-  video_params_high.video = {
-      true,   1280,    720,     30,
-      800000, 2500000, 2500000, false,
-      "VP8",  3,       2,       400000,
-      false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  video_params_high.video = kSimulcastVP8VideoHigh;
   VideoQualityTest::Params video_params_medium;
-  video_params_medium.video = {
-      true,   640,    360,    30,
-      150000, 500000, 700000, false,
-      "VP8",  3,      2,      400000,
-      false,  false,  "",     "ConferenceMotion_1280_720_50"};
+  video_params_medium.video = kSimulcastVP8VideoMedium;
   VideoQualityTest::Params video_params_low;
-  video_params_low.video = {
-      true,  320,    180,    30,
-      30000, 150000, 200000, false,
-      "VP8", 3,      2,      400000,
-      false, false,  "",     "ConferenceMotion_1280_720_50"};
+  video_params_low.video = kSimulcastVP8VideoLow;
 
   std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low),
                                       DefaultVideoStream(video_params_medium),
                                       DefaultVideoStream(video_params_high)};
   large_room.num_thumbnails = 15;
   large_room.ss = {streams, 2, 1, 0};
   RunTest(large_room);
 }
 
 #if defined(WEBRTC_LINUX)
 TEST_F(FullStackTest, LargeRoomVP8_50thumb) {
   VideoQualityTest::Params large_room;
   large_room.call.send_side_bwe = true;
-  large_room.video = {true,   1280,    720,     30,
-                      800000, 2500000, 2500000, false,
-                      "VP8",  3,       2,       400000,
-                      false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  large_room.video = kSimulcastVP8VideoHigh;
   large_room.analyzer = {"largeroom_50thumb", 0.0, 0.0,
                          kFullStackTestDurationSecs};
   large_room.pipe.loss_percent = 0;
   large_room.pipe.queue_delay_ms = 100;
   VideoQualityTest::Params video_params_high;
-  video_params_high.video = {
-      true,   1280,    720,     30,
-      800000, 2500000, 2500000, false,
-      "VP8",  3,       2,       400000,
-      false,  false,   "",      "ConferenceMotion_1280_720_50"};
+  video_params_high.video = kSimulcastVP8VideoHigh;
   VideoQualityTest::Params video_params_medium;
-  video_params_medium.video = {
-      true,   640,    360,    30,
-      150000, 500000, 700000, false,
-      "VP8",  3,      2,      400000,
-      false,  false,  "",     "ConferenceMotion_1280_720_50"};
+  video_params_medium.video = kSimulcastVP8VideoMedium;
   VideoQualityTest::Params video_params_low;
-  video_params_low.video = {
-      true,  320,    180,    30,
-      30000, 150000, 200000, false,
-      "VP8", 3,      2,      400000,
-      false, false,  "",     "ConferenceMotion_1280_720_50"};
+  video_params_low.video = kSimulcastVP8VideoLow;
 
   std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low),
                                       DefaultVideoStream(video_params_medium),
                                       DefaultVideoStream(video_params_high)};
   large_room.num_thumbnails = 50;
   large_room.ss = {streams, 2, 1, 0};
   RunTest(large_room);
 }
 #endif  // defined(WEBRTC_LINUX)
 
 }  // namespace webrtc