Index: webrtc/video/full_stack.cc |
diff --git a/webrtc/video/full_stack.cc b/webrtc/video/full_stack.cc |
index 6433f6feb7feff6d4d08fde13d22e54d960c9f30..73744e01ede3441cfcede28129131431276b9b77 100644 |
--- a/webrtc/video/full_stack.cc |
+++ b/webrtc/video/full_stack.cc |
@@ -26,7 +26,7 @@ class FullStackTest : public VideoQualityTest { |
// TODO(pbos): Decide on psnr/ssim thresholds for foreman_cif. |
VideoQualityTest::Params foreman_cif; |
foreman_cif.video = {true, 352, 288, 30, 700000, 700000, 700000, false, |
- video_codec, 1, 0, 0, false, "", "foreman_cif"}; |
+ video_codec, 1, 0, 0, false, false, "", "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_net_delay_0_0_plr_0_" + video_codec, |
0.0, 0.0, kFullStackTestDurationSecs}; |
RunTest(foreman_cif); |
@@ -35,7 +35,7 @@ class FullStackTest : public VideoQualityTest { |
void ForemanCifPlr5(const std::string& video_codec) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, |
- video_codec, 1, 0, 0, false, "", "foreman_cif"}; |
+ video_codec, 1, 0, 0, false, false, "", "foreman_cif"}; |
foreman_cif.analyzer = {"foreman_cif_delay_50_0_plr_5_" + video_codec, 0.0, |
0.0, kFullStackTestDurationSecs}; |
foreman_cif.pipe.loss_percent = 5; |
@@ -68,7 +68,7 @@ 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, "", "paris_qcif"}; |
+ "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); |
@@ -79,7 +79,7 @@ TEST_F(FullStackTest, ForemanCifWithoutPacketLoss) { |
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, "", "foreman_cif"}; |
+ 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); |
@@ -89,7 +89,7 @@ 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, "", "foreman_cif"}; |
+ 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; |
@@ -101,7 +101,7 @@ 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, "", "foreman_cif"}; |
+ 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; |
@@ -114,7 +114,7 @@ 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, "", "foreman_cif"}; |
+ 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; |
@@ -127,7 +127,7 @@ 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, "", "foreman_cif"}; |
+ 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; |
@@ -140,7 +140,7 @@ 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, "", "foreman_cif"}; |
+ 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; |
@@ -152,7 +152,7 @@ TEST_F(FullStackTest, ForemanCif500kbps100msLimitedQueue) { |
TEST_F(FullStackTest, ForemanCif500kbps100msLimitedQueueRecvBwe) { |
VideoQualityTest::Params foreman_cif; |
foreman_cif.video = {true, 352, 288, 30, 30000, 500000, 2000000, false, "VP8", |
- 1, 0, 0, false, "", "foreman_cif"}; |
+ 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; |
@@ -165,7 +165,7 @@ 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, "", "foreman_cif"}; |
+ "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; |
@@ -178,7 +178,7 @@ 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, "", |
+ "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}; |
@@ -192,7 +192,7 @@ 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, "", ""}; |
+ "VP8", 2, 1, 400000, false, false, "", ""}; |
screenshare.screenshare = {true, 10}; |
screenshare.analyzer = {"screenshare_slides", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -203,7 +203,7 @@ 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, "", ""}; |
+ "VP8", 2, 1, 400000, false, false, "", ""}; |
config.screenshare = {true, 10, 2}; |
config.analyzer = {"screenshare_slides_scrolling", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -214,7 +214,7 @@ 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, "", ""}; |
+ "VP8", 2, 1, 400000, false, false, "", ""}; |
screenshare.screenshare = {true, 10}; |
screenshare.analyzer = {"screenshare_slides_lossy_net", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -228,7 +228,7 @@ 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, "", ""}; |
+ "VP8", 2, 1, 400000, false, false, "", ""}; |
screenshare.screenshare = {true, 10}; |
screenshare.analyzer = {"screenshare_slides_very_lossy", 0.0, 0.0, |
kFullStackTestDurationSecs}; |
@@ -243,7 +243,7 @@ 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, "", ""}; |
+ "VP9", 1, 0, 400000, false, false, "", ""}; |
screenshare.screenshare = {true, 10}; |
screenshare.analyzer = {"screenshare_slides_vp9_2sl", 0.0, 0.0, |
kFullStackTestDurationSecs}; |