Index: webrtc/video/full_stack_tests.cc |
diff --git a/webrtc/video/full_stack_tests.cc b/webrtc/video/full_stack_tests.cc |
index 3116ed3b0058fc5d4fd0664271c4bc85a837e2ce..8190bf6cb5290394d89640c1185d2a46b6148817 100644 |
--- a/webrtc/video/full_stack_tests.cc |
+++ b/webrtc/video/full_stack_tests.cc |
@@ -49,8 +49,8 @@ TEST_F(FullStackTest, ForemanCifWithoutPacketLossVp9) { |
// TODO(pbos): Decide on psnr/ssim thresholds for foreman_cif. |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 700000, 700000, 700000, false, |
- "VP9", 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 700000, 700000, 700000, false, |
+ "VP9", 1, 0, 0, false, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_net_delay_0_0_plr_0_VP9", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
RunTest(foreman_cif); |
@@ -59,8 +59,8 @@ TEST_F(FullStackTest, ForemanCifWithoutPacketLossVp9) { |
TEST_F(FullStackTest, ForemanCifPlr5Vp9) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
- "VP9", 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "VP9", 1, 0, 0, false, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_VP9", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
foreman_cif.pipe.loss_percent = 5; |
@@ -72,8 +72,8 @@ TEST_F(FullStackTest, ForemanCifPlr5Vp9) { |
TEST_F(FullStackTest, ParisQcifWithoutPacketLoss) { |
VideoQualityTest::Params paris_qcif; |
paris_qcif.call.send_side_bwe = true; |
- paris_qcif.video = {true, 176, 144, 30, 300000, 300000, 300000, false, |
- "VP8", 1, 0, 0, false, false, "", "paris_qcif"}; |
+ paris_qcif.video = {true, 176, 144, 30, 300000, 300000, 300000, false, |
+ "VP8", 1, 0, 0, false, false, "paris_qcif"}; |
paris_qcif.analyzer = {"net_delay_0_0_plr_0", 36.0, 0.96, |
kFullStackTestDurationSecs}; |
RunTest(paris_qcif); |
@@ -83,8 +83,8 @@ TEST_F(FullStackTest, ForemanCifWithoutPacketLoss) { |
// TODO(pbos): Decide on psnr/ssim thresholds for foreman_cif. |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 700000, 700000, 700000, false, "VP8", |
- 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 700000, 700000, 700000, false, |
+ "VP8", 1, 0, 0, false, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_net_delay_0_0_plr_0", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
RunTest(foreman_cif); |
@@ -93,8 +93,8 @@ TEST_F(FullStackTest, ForemanCifWithoutPacketLoss) { |
TEST_F(FullStackTest, ForemanCif30kbpsWithoutPacketLoss) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 10, 30000, 30000, 30000, false, |
- "VP8", 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 10, 30000, 30000, 30000, false, |
+ "VP8", 1, 0, 0, false, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_30kbps_net_delay_0_0_plr_0", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
RunTest(foreman_cif); |
@@ -103,8 +103,8 @@ TEST_F(FullStackTest, ForemanCif30kbpsWithoutPacketLoss) { |
TEST_F(FullStackTest, ForemanCifPlr5) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8", |
- 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "VP8", 1, 0, 0, false, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
foreman_cif.pipe.loss_percent = 5; |
@@ -115,8 +115,8 @@ TEST_F(FullStackTest, ForemanCifPlr5) { |
TEST_F(FullStackTest, ForemanCifPlr5Ulpfec) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8", |
- 1, 0, 0, true, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "VP8", 1, 0, 0, true, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_ulpfec", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
foreman_cif.pipe.loss_percent = 5; |
@@ -127,8 +127,8 @@ TEST_F(FullStackTest, ForemanCifPlr5Ulpfec) { |
TEST_F(FullStackTest, ForemanCifPlr5Flexfec) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8", |
- 1, 0, 0, false, true, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "VP8", 1, 0, 0, false, true, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_flexfec", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
foreman_cif.pipe.loss_percent = 5; |
@@ -139,9 +139,8 @@ TEST_F(FullStackTest, ForemanCifPlr5Flexfec) { |
TEST_F(FullStackTest, ForemanCif500kbpsPlr3Flexfec) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, |
- false, "VP8", 1, 0, 0, false, true, |
- "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "VP8", 1, 0, 0, false, true, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_500kbps_delay_50_0_plr_3_flexfec", 0.0, |
0.0, kFullStackTestDurationSecs}; |
foreman_cif.pipe.loss_percent = 3; |
@@ -153,9 +152,8 @@ TEST_F(FullStackTest, ForemanCif500kbpsPlr3Flexfec) { |
TEST_F(FullStackTest, ForemanCif500kbpsPlr3Ulpfec) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, |
- false, "VP8", 1, 0, 0, true, false, |
- "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "VP8", 1, 0, 0, true, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_500kbps_delay_50_0_plr_3_ulpfec", 0.0, |
0.0, kFullStackTestDurationSecs}; |
foreman_cif.pipe.loss_percent = 3; |
@@ -169,8 +167,9 @@ TEST_F(FullStackTest, ForemanCifWithoutPacketlossH264) { |
// TODO(pbos): Decide on psnr/ssim thresholds for foreman_cif. |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 700000, 700000, 700000, false, |
- "H264", 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 700000, |
+ 700000, 700000, false, "H264", 1, |
+ 0, 0, false, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_net_delay_0_0_plr_0_H264", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
RunTest(foreman_cif); |
@@ -179,8 +178,8 @@ TEST_F(FullStackTest, ForemanCifWithoutPacketlossH264) { |
TEST_F(FullStackTest, ForemanCif30kbpsWithoutPacketlossH264) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 10, 30000, 30000, 30000, false, "H264", |
- 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 10, 30000, 30000, 30000, false, |
+ "H264", 1, 0, 0, false, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_30kbps_net_delay_0_0_plr_0_H264", 0.0, |
0.0, kFullStackTestDurationSecs}; |
RunTest(foreman_cif); |
@@ -189,8 +188,8 @@ TEST_F(FullStackTest, ForemanCif30kbpsWithoutPacketlossH264) { |
TEST_F(FullStackTest, ForemanCifPlr5H264) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
- "H264", 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "H264", 1, 0, 0, false, false, "foreman_cif"}; |
std::string fec_description; |
foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_H264", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -203,8 +202,8 @@ TEST_F(FullStackTest, ForemanCifPlr5H264) { |
TEST_F(FullStackTest, ForemanCifPlr5H264Flexfec) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
- "H264", 1, 0, 0, false, true, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "H264", 1, 0, 0, false, true, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_H264_flexfec", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
foreman_cif.pipe.loss_percent = 5; |
@@ -217,8 +216,8 @@ TEST_F(FullStackTest, ForemanCifPlr5H264Flexfec) { |
TEST_F(FullStackTest, DISABLED_ForemanCifPlr5H264Ulpfec) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
- "H264", 1, 0, 0, true, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "H264", 1, 0, 0, true, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_H264_ulpfec", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
foreman_cif.pipe.loss_percent = 5; |
@@ -230,8 +229,8 @@ TEST_F(FullStackTest, DISABLED_ForemanCifPlr5H264Ulpfec) { |
TEST_F(FullStackTest, ForemanCif500kbps) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8", |
- 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "VP8", 1, 0, 0, false, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_500kbps", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
foreman_cif.pipe.queue_length_packets = 0; |
@@ -243,8 +242,8 @@ TEST_F(FullStackTest, ForemanCif500kbps) { |
TEST_F(FullStackTest, ForemanCif500kbpsLimitedQueue) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8", |
- 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "VP8", 1, 0, 0, false, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_500kbps_32pkts_queue", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
foreman_cif.pipe.queue_length_packets = 32; |
@@ -256,8 +255,8 @@ TEST_F(FullStackTest, ForemanCif500kbpsLimitedQueue) { |
TEST_F(FullStackTest, ForemanCif500kbps100ms) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8", |
- 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "VP8", 1, 0, 0, false, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_500kbps_100ms", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
foreman_cif.pipe.queue_length_packets = 0; |
@@ -269,8 +268,8 @@ TEST_F(FullStackTest, ForemanCif500kbps100ms) { |
TEST_F(FullStackTest, ForemanCif500kbps100msLimitedQueue) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8", |
- 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "VP8", 1, 0, 0, false, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_500kbps_100ms_32pkts_queue", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
foreman_cif.pipe.queue_length_packets = 32; |
@@ -282,8 +281,8 @@ TEST_F(FullStackTest, ForemanCif500kbps100msLimitedQueue) { |
TEST_F(FullStackTest, ForemanCif500kbps100msLimitedQueueRecvBwe) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = false; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8", |
- 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
+ "VP8", 1, 0, 0, false, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_500kbps_100ms_32pkts_queue_recv_bwe", |
0.0, 0.0, kFullStackTestDurationSecs}; |
foreman_cif.pipe.queue_length_packets = 32; |
@@ -295,8 +294,8 @@ TEST_F(FullStackTest, ForemanCif500kbps100msLimitedQueueRecvBwe) { |
TEST_F(FullStackTest, ForemanCif1000kbps100msLimitedQueue) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.call.send_side_bwe = true; |
- foreman_cif.video = {true, 352, 288, 30, 30000, 2000000, 2000000, false, |
- "VP8", 1, 0, 0, false, false, "", "foreman_cif"}; |
+ foreman_cif.video = {true, 352, 288, 30, 30000, 2000000, 2000000, false, |
+ "VP8", 1, 0, 0, false, false, "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_1000kbps_100ms_32pkts_queue", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
foreman_cif.pipe.queue_length_packets = 32; |
@@ -308,9 +307,10 @@ TEST_F(FullStackTest, ForemanCif1000kbps100msLimitedQueue) { |
TEST_F(FullStackTest, ConferenceMotionHd2000kbps100msLimitedQueue) { |
VideoQualityTest::Params conf_motion_hd; |
conf_motion_hd.call.send_side_bwe = true; |
- conf_motion_hd.video = {true, 1280, 720, 50, 30000, 3000000, 3000000, false, |
- "VP8", 1, 0, 0, false, false, "", |
- "ConferenceMotion_1280_720_50"}; |
+ conf_motion_hd.video = { |
+ true, 1280, 720, 50, 30000, |
+ 3000000, 3000000, false, "VP8", 1, |
+ 0, 0, false, false, "ConferenceMotion_1280_720_50"}; |
conf_motion_hd.analyzer = {"conference_motion_hd_2000kbps_100ms_32pkts_queue", |
0.0, 0.0, kFullStackTestDurationSecs}; |
conf_motion_hd.pipe.queue_length_packets = 32; |
@@ -323,9 +323,10 @@ TEST_F(FullStackTest, ConferenceMotionHd2000kbps100msLimitedQueue) { |
TEST_F(FullStackTest, ConferenceMotionHd2000kbps100msLimitedQueueVP9) { |
VideoQualityTest::Params conf_motion_hd; |
conf_motion_hd.call.send_side_bwe = true; |
- conf_motion_hd.video = {true, 1280, 720, 50, 30000, 3000000, 3000000, false, |
- "VP9", 1, 0, 0, false, false, "", |
- "ConferenceMotion_1280_720_50"}; |
+ conf_motion_hd.video = { |
+ true, 1280, 720, 50, 30000, |
+ 3000000, 3000000, false, "VP9", 1, |
+ 0, 0, false, false, "ConferenceMotion_1280_720_50"}; |
conf_motion_hd.analyzer = { |
"conference_motion_hd_2000kbps_100ms_32pkts_queue_vp9", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -339,8 +340,8 @@ TEST_F(FullStackTest, ConferenceMotionHd2000kbps100msLimitedQueueVP9) { |
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.video = {true, 1850, 1110, 5, 50000, 200000, 2000000, false, |
+ "VP8", 2, 1, 400000, false, false, ""}; |
screenshare.screenshare = {true, 10}; |
screenshare.analyzer = {"screenshare_slides", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -352,19 +353,19 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_3TL_Simulcast) { |
VideoQualityTest::Params screenshare; |
screenshare.call.send_side_bwe = true; |
screenshare.screenshare = {true, 10}; |
- screenshare.video = {true, 1850, 1110, 5, 800000, 2500000, |
- 2500000, false, "VP8", 3, 2, 400000, |
- false, false, "", ""}; |
+ 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 = {true, 1850, 1110, 5, 800000, |
+ 2500000, 2500000, false, "VP8", 3, |
+ 0, 400000, false, false, ""}; |
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 = {true, 1850, 1110, 5, 50000, |
+ 200000, 2000000, false, "VP8", 2, |
+ 0, 400000, false, false, ""}; |
std::vector<VideoStream> streams = { |
DefaultVideoStream(screenshare_params_low), |
@@ -376,8 +377,8 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_3TL_Simulcast) { |
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.video = {true, 1850, 1110 / 2, 5, 50000, 200000, 2000000, false, |
+ "VP8", 2, 1, 400000, false, false, ""}; |
config.screenshare = {true, 10, 2}; |
config.analyzer = {"screenshare_slides_scrolling", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -387,8 +388,8 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Scroll) { |
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.video = {true, 1850, 1110, 5, 50000, 200000, 2000000, false, |
+ "VP8", 2, 1, 400000, false, false, ""}; |
screenshare.screenshare = {true, 10}; |
screenshare.analyzer = {"screenshare_slides_lossy_net", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -401,8 +402,8 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_LossyNet) { |
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.video = {true, 1850, 1110, 5, 50000, 200000, 2000000, false, |
+ "VP8", 2, 1, 400000, false, false, ""}; |
screenshare.screenshare = {true, 10}; |
screenshare.analyzer = {"screenshare_slides_very_lossy", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -415,8 +416,8 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_VeryLossyNet) { |
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.video = {true, 1850, 1110, 5, 50000, 200000, 2000000, false, |
+ "VP8", 2, 1, 400000, false, false, ""}; |
screenshare.screenshare = {true, 10}; |
screenshare.analyzer = {"screenshare_slides_lossy_limited", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -431,7 +432,7 @@ 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, "", ""}; |
+ "VP8", 2, 1, 400000, false, false, ""}; |
screenshare.screenshare = {true, 10}; |
screenshare.analyzer = {"screenshare_slides_moderately_restricted", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -448,7 +449,7 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_LossyNetRestrictedQueue_ALR) { |
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, "", ""}; |
+ "VP8", 2, 1, 400000, false, false, ""}; |
screenshare.screenshare = {true, 10}; |
screenshare.analyzer = {"screenshare_slides_lossy_limited_ALR", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -464,7 +465,7 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_ALR) { |
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, "", ""}; |
+ "VP8", 2, 1, 400000, false, false, ""}; |
screenshare.screenshare = {true, 10}; |
screenshare.analyzer = {"screenshare_slides_ALR", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -476,7 +477,7 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_ModeratelyRestricted_ALR) { |
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, "", ""}; |
+ "VP8", 2, 1, 400000, false, false, ""}; |
screenshare.screenshare = {true, 10}; |
screenshare.analyzer = {"screenshare_slides_moderately_restricted_ALR", 0.0, |
0.0, kFullStackTestDurationSecs}; |
@@ -493,19 +494,19 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_3TL_Simulcast_ALR) { |
VideoQualityTest::Params screenshare; |
screenshare.call.send_side_bwe = true; |
screenshare.screenshare = {true, 10}; |
- screenshare.video = {true, 1850, 1110, 5, 800000, 2500000, |
- 2500000, false, "VP8", 3, 2, 400000, |
- false, false, "", ""}; |
+ 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, "", ""}; |
+ screenshare_params_high.video = {true, 1850, 1110, 5, 800000, |
+ 2500000, 2500000, false, "VP8", 3, |
+ 0, 400000, false, false, ""}; |
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 = {true, 1850, 1110, 5, 50000, |
+ 200000, 2000000, false, "VP8", 2, |
+ 0, 400000, false, false, ""}; |
std::vector<VideoStream> streams = { |
DefaultVideoStream(screenshare_params_low), |
@@ -515,39 +516,34 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_3TL_Simulcast_ALR) { |
} |
const VideoQualityTest::Params::Video kSvcVp9Video = { |
- true, 1280, 720, 30, |
- 800000, 2500000, 2500000, false, |
- "VP9", 3, 2, 400000, |
- false, false, "", "ConferenceMotion_1280_720_50"}; |
+ 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"}; |
+ 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"}; |
+ 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"}; |
+ 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.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, |
std::vector<SpatialLayer>(), false}; |
RunTest(screenshare); |
@@ -559,7 +555,6 @@ TEST_F(FullStackTest, VP9SVC_3SL_High) { |
simulcast.video = kSvcVp9Video; |
simulcast.analyzer = {"vp9svc_3sl_high", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
- simulcast.logs = false; |
simulcast.ss = {std::vector<VideoStream>(), 0, 3, 2, |
std::vector<SpatialLayer>(), false}; |
RunTest(simulcast); |
@@ -571,7 +566,6 @@ TEST_F(FullStackTest, VP9SVC_3SL_Medium) { |
simulcast.video = kSvcVp9Video; |
simulcast.analyzer = {"vp9svc_3sl_medium", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
- simulcast.logs = false; |
simulcast.ss = {std::vector<VideoStream>(), 0, 3, 1, |
std::vector<SpatialLayer>(), false}; |
RunTest(simulcast); |
@@ -582,7 +576,6 @@ TEST_F(FullStackTest, VP9SVC_3SL_Low) { |
simulcast.call.send_side_bwe = true; |
simulcast.video = kSvcVp9Video; |
simulcast.analyzer = {"vp9svc_3sl_low", 0.0, 0.0, kFullStackTestDurationSecs}; |
- simulcast.logs = false; |
simulcast.ss = {std::vector<VideoStream>(), 0, 3, 0, |
std::vector<SpatialLayer>(), false}; |
RunTest(simulcast); |
@@ -599,9 +592,9 @@ TEST_F(FullStackTest, VP9SVC_3SL_Low) { |
TEST_F(FullStackTest, MAYBE_SimulcastFullHdOveruse) { |
VideoQualityTest::Params simulcast; |
simulcast.call.send_side_bwe = true; |
- simulcast.video = {true, 1920, 1080, 30, 800000, 2500000, |
- 2500000, false, "VP8", 3, 2, 400000, |
- false, false, "", "Generator"}; |
+ simulcast.video = {true, 1920, 1080, 30, 800000, |
+ 2500000, 2500000, false, "VP8", 3, |
+ 2, 400000, false, false, "Generator"}; |
simulcast.analyzer = {"simulcast_HD_high", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
simulcast.pipe.loss_percent = 0; |
@@ -699,7 +692,7 @@ TEST_F(FullStackTest, LargeRoomVP8_5thumb) { |
std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), |
DefaultVideoStream(video_params_medium), |
DefaultVideoStream(video_params_high)}; |
- large_room.num_thumbnails = 5; |
+ large_room.call.num_thumbnails = 5; |
large_room.ss = {streams, 2, 1, 0, std::vector<SpatialLayer>(), false}; |
RunTest(large_room); |
} |
@@ -732,7 +725,7 @@ TEST_F(FullStackTest, MAYBE_LargeRoomVP8_15thumb) { |
std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), |
DefaultVideoStream(video_params_medium), |
DefaultVideoStream(video_params_high)}; |
- large_room.num_thumbnails = 15; |
+ large_room.call.num_thumbnails = 15; |
large_room.ss = {streams, 2, 1, 0, std::vector<SpatialLayer>(), false}; |
RunTest(large_room); |
} |
@@ -755,7 +748,7 @@ TEST_F(FullStackTest, MAYBE_LargeRoomVP8_50thumb) { |
std::vector<VideoStream> streams = {DefaultVideoStream(video_params_low), |
DefaultVideoStream(video_params_medium), |
DefaultVideoStream(video_params_high)}; |
- large_room.num_thumbnails = 50; |
+ large_room.call.num_thumbnails = 50; |
large_room.ss = {streams, 2, 1, 0, std::vector<SpatialLayer>(), false}; |
RunTest(large_room); |
} |