| Index: webrtc/video/full_stack.cc
|
| diff --git a/webrtc/video/full_stack.cc b/webrtc/video/full_stack.cc
|
| index 8511b8281e91ab97f3b655302760d053fc0d1404..222fa2f4bed0d2350d173af3f640dcfb09f8640a 100644
|
| --- a/webrtc/video/full_stack.cc
|
| +++ b/webrtc/video/full_stack.cc
|
| @@ -24,124 +24,148 @@ class FullStackTest : public VideoQualityTest {
|
| };
|
|
|
|
|
| -TEST_F(FullStackTest, ParisQcifWithoutPacketLoss) {
|
| - VideoQualityTest::Params paris_qcif = {
|
| - {176, 144, 30, 300000, 300000, 300000, "VP8", 1},
|
| - {"paris_qcif"},
|
| - {},
|
| - {"net_delay_0_0_plr_0", 36.0, 0.96, kFullStackTestDurationSecs}};
|
| - RunTest(paris_qcif);
|
| +// TEST_F(FullStackTest, ParisQcifWithoutPacketLoss) {
|
| +// VideoQualityTest::Params paris_qcif = {
|
| +// {176, 144, 30, 300000, 300000, 300000, "VP8", 1},
|
| +// {"paris_qcif"},
|
| +// {},
|
| +// {"net_delay_0_0_plr_0", 36.0, 0.96, kFullStackTestDurationSecs}};
|
| +// RunTest(paris_qcif);
|
| +// }
|
| +//
|
| +// TEST_F(FullStackTest, ForemanCifWithoutPacketLoss) {
|
| +// // TODO(pbos): Decide on psnr/ssim thresholds for foreman_cif.
|
| +// VideoQualityTest::Params foreman_cif = {
|
| +// {352, 288, 30, 700000, 700000, 700000, "VP8", 1},
|
| +// {"foreman_cif"},
|
| +// {},
|
| +// {"foreman_cif_net_delay_0_0_plr_0", 0.0, 0.0, kFullStackTestDurationSecs}
|
| +// };
|
| +// RunTest(foreman_cif);
|
| +// }
|
| +//
|
| +// TEST_F(FullStackTest, ForemanCifPlr5) {
|
| +// VideoQualityTest::Params foreman_cif = {
|
| +// {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
|
| +// {"foreman_cif"},
|
| +// {},
|
| +// {"foreman_cif_delay_50_0_plr_5", 0.0, 0.0, kFullStackTestDurationSecs}};
|
| +// foreman_cif.pipe.loss_percent = 5;
|
| +// foreman_cif.pipe.queue_delay_ms = 50;
|
| +// RunTest(foreman_cif);
|
| +// }
|
| +//
|
| +// TEST_F(FullStackTest, ForemanCif500kbps) {
|
| +// VideoQualityTest::Params foreman_cif = {
|
| +// {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
|
| +// {"foreman_cif"},
|
| +// {},
|
| +// {"foreman_cif_500kbps", 0.0, 0.0, kFullStackTestDurationSecs}};
|
| +// foreman_cif.pipe.queue_length_packets = 0;
|
| +// foreman_cif.pipe.queue_delay_ms = 0;
|
| +// foreman_cif.pipe.link_capacity_kbps = 500;
|
| +// RunTest(foreman_cif);
|
| +// }
|
| +//
|
| +// TEST_F(FullStackTest, ForemanCif500kbpsLimitedQueue) {
|
| +// VideoQualityTest::Params foreman_cif = {
|
| +// {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
|
| +// {"foreman_cif"},
|
| +// {},
|
| +// {"foreman_cif_500kbps_32pkts_queue", 0.0, 0.0, kFullStackTestDurationSecs}
|
| +// };
|
| +// foreman_cif.pipe.queue_length_packets = 32;
|
| +// foreman_cif.pipe.queue_delay_ms = 0;
|
| +// foreman_cif.pipe.link_capacity_kbps = 500;
|
| +// RunTest(foreman_cif);
|
| +// }
|
| +//
|
| +// TEST_F(FullStackTest, ForemanCif500kbps100ms) {
|
| +// VideoQualityTest::Params foreman_cif = {
|
| +// {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
|
| +// {"foreman_cif"},
|
| +// {},
|
| +// {"foreman_cif_500kbps_100ms", 0.0, 0.0, kFullStackTestDurationSecs}};
|
| +// foreman_cif.pipe.queue_length_packets = 0;
|
| +// foreman_cif.pipe.queue_delay_ms = 100;
|
| +// foreman_cif.pipe.link_capacity_kbps = 500;
|
| +// RunTest(foreman_cif);
|
| +// }
|
| +//
|
| +// TEST_F(FullStackTest, ForemanCif500kbps100msLimitedQueue) {
|
| +// VideoQualityTest::Params foreman_cif = {
|
| +// {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
|
| +// {"foreman_cif"},
|
| +// {},
|
| +// {"foreman_cif_500kbps_100ms_32pkts_queue", 0.0, 0.0,
|
| +// kFullStackTestDurationSecs}};
|
| +// foreman_cif.pipe.queue_length_packets = 32;
|
| +// foreman_cif.pipe.queue_delay_ms = 100;
|
| +// foreman_cif.pipe.link_capacity_kbps = 500;
|
| +// RunTest(foreman_cif);
|
| +// }
|
| +//
|
| +// TEST_F(FullStackTest, ForemanCif1000kbps100msLimitedQueue) {
|
| +// VideoQualityTest::Params foreman_cif = {
|
| +// {352, 288, 30, 30000, 2000000, 2000000, "VP8", 1},
|
| +// {"foreman_cif"},
|
| +// {},
|
| +// {"foreman_cif_1000kbps_100ms_32pkts_queue", 0.0, 0.0,
|
| +// kFullStackTestDurationSecs}};
|
| +// foreman_cif.pipe.queue_length_packets = 32;
|
| +// foreman_cif.pipe.queue_delay_ms = 100;
|
| +// foreman_cif.pipe.link_capacity_kbps = 1000;
|
| +// RunTest(foreman_cif);
|
| +// }
|
| +//
|
| +// // Temporarily disabled on Android due to low test timeouts.
|
| +// // https://code.google.com/p/chromium/issues/detail?id=513170
|
| +// #include "webrtc/test/testsupport/gtest_disable.h"
|
| +// TEST_F(FullStackTest, DISABLED_ON_ANDROID(ScreenshareSlidesVP8_2TL)) {
|
| +// VideoQualityTest::Params screenshare = {
|
| +// {1850, 1110, 5, 50000, 200000, 2000000, "VP8", 2, 400000},
|
| +// {}, // Video-specific.
|
| +// {true, 10}, // Screenshare-specific.
|
| +// {"screenshare_slides", 0.0, 0.0, kFullStackTestDurationSecs}};
|
| +// RunTest(screenshare);
|
| +// }
|
| +//
|
| +// TEST_F(FullStackTest, DISABLED_ON_ANDROID(ScreenshareSlidesVP8_2TL_Scroll)) {
|
| +// VideoQualityTest::Params config = {
|
| +// {1850, 1110 / 2, 5, 50000, 200000, 2000000, "VP8", 2, 400000},
|
| +// {},
|
| +// {true, 10, 2},
|
| +// {"screenshare_slides_scrolling", 0.0, 0.0, kFullStackTestDurationSecs}};
|
| +// RunTest(config);
|
| +// }
|
| +
|
| +#define SCREENSHARE_VP8_2TL { \
|
| + VideoQualityTest::Params screenshare = { \
|
| + {1850, 1110, 5, 50000, 200000, 2000000, "VP8", 2, 400000}, \
|
| + {}, \
|
| + {true, 10}, \
|
| + {"screenshare_slides", 0.0, 0.0, kFullStackTestDurationSecs}}; \
|
| + RunTest(screenshare); \
|
| }
|
|
|
| -TEST_F(FullStackTest, ForemanCifWithoutPacketLoss) {
|
| - // TODO(pbos): Decide on psnr/ssim thresholds for foreman_cif.
|
| - VideoQualityTest::Params foreman_cif = {
|
| - {352, 288, 30, 700000, 700000, 700000, "VP8", 1},
|
| - {"foreman_cif"},
|
| - {},
|
| - {"foreman_cif_net_delay_0_0_plr_0", 0.0, 0.0, kFullStackTestDurationSecs}
|
| - };
|
| - RunTest(foreman_cif);
|
| +#define SCREENSHARE_VP9_2TL { \
|
| + VideoQualityTest::Params screenshare = { \
|
| + {1850, 1110, 5, 50000, 200000, 2000000, "VP9", 2, 400000}, \
|
| + {}, \
|
| + {true, 10}, \
|
| + {"screenshare_slides_vp9_2tl", 0.0, 0.0, kFullStackTestDurationSecs}}; \
|
| + RunTest(screenshare); \
|
| }
|
|
|
| -TEST_F(FullStackTest, ForemanCifPlr5) {
|
| - VideoQualityTest::Params foreman_cif = {
|
| - {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
|
| - {"foreman_cif"},
|
| - {},
|
| - {"foreman_cif_delay_50_0_plr_5", 0.0, 0.0, kFullStackTestDurationSecs}};
|
| - foreman_cif.pipe.loss_percent = 5;
|
| - foreman_cif.pipe.queue_delay_ms = 50;
|
| - RunTest(foreman_cif);
|
| -}
|
| -
|
| -TEST_F(FullStackTest, ForemanCif500kbps) {
|
| - VideoQualityTest::Params foreman_cif = {
|
| - {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
|
| - {"foreman_cif"},
|
| - {},
|
| - {"foreman_cif_500kbps", 0.0, 0.0, kFullStackTestDurationSecs}};
|
| - foreman_cif.pipe.queue_length_packets = 0;
|
| - foreman_cif.pipe.queue_delay_ms = 0;
|
| - foreman_cif.pipe.link_capacity_kbps = 500;
|
| - RunTest(foreman_cif);
|
| -}
|
| -
|
| -TEST_F(FullStackTest, ForemanCif500kbpsLimitedQueue) {
|
| - VideoQualityTest::Params foreman_cif = {
|
| - {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
|
| - {"foreman_cif"},
|
| - {},
|
| - {"foreman_cif_500kbps_32pkts_queue", 0.0, 0.0, kFullStackTestDurationSecs}
|
| - };
|
| - foreman_cif.pipe.queue_length_packets = 32;
|
| - foreman_cif.pipe.queue_delay_ms = 0;
|
| - foreman_cif.pipe.link_capacity_kbps = 500;
|
| - RunTest(foreman_cif);
|
| -}
|
| -
|
| -TEST_F(FullStackTest, ForemanCif500kbps100ms) {
|
| - VideoQualityTest::Params foreman_cif = {
|
| - {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
|
| - {"foreman_cif"},
|
| - {},
|
| - {"foreman_cif_500kbps_100ms", 0.0, 0.0, kFullStackTestDurationSecs}};
|
| - foreman_cif.pipe.queue_length_packets = 0;
|
| - foreman_cif.pipe.queue_delay_ms = 100;
|
| - foreman_cif.pipe.link_capacity_kbps = 500;
|
| - RunTest(foreman_cif);
|
| -}
|
| -
|
| -TEST_F(FullStackTest, ForemanCif500kbps100msLimitedQueue) {
|
| - VideoQualityTest::Params foreman_cif = {
|
| - {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
|
| - {"foreman_cif"},
|
| - {},
|
| - {"foreman_cif_500kbps_100ms_32pkts_queue", 0.0, 0.0,
|
| - kFullStackTestDurationSecs}};
|
| - foreman_cif.pipe.queue_length_packets = 32;
|
| - foreman_cif.pipe.queue_delay_ms = 100;
|
| - foreman_cif.pipe.link_capacity_kbps = 500;
|
| - RunTest(foreman_cif);
|
| -}
|
| -
|
| -TEST_F(FullStackTest, ForemanCif1000kbps100msLimitedQueue) {
|
| - VideoQualityTest::Params foreman_cif = {
|
| - {352, 288, 30, 30000, 2000000, 2000000, "VP8", 1},
|
| - {"foreman_cif"},
|
| - {},
|
| - {"foreman_cif_1000kbps_100ms_32pkts_queue", 0.0, 0.0,
|
| - kFullStackTestDurationSecs}};
|
| - foreman_cif.pipe.queue_length_packets = 32;
|
| - foreman_cif.pipe.queue_delay_ms = 100;
|
| - foreman_cif.pipe.link_capacity_kbps = 1000;
|
| - RunTest(foreman_cif);
|
| -}
|
| -
|
| -TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL) {
|
| - VideoQualityTest::Params screenshare = {
|
| - {1850, 1110, 5, 50000, 200000, 2000000, "VP8", 2, 400000},
|
| - {}, // Video-specific.
|
| - {true, 10}, // Screenshare-specific.
|
| - {"screenshare_slides", 0.0, 0.0, kFullStackTestDurationSecs}};
|
| - RunTest(screenshare);
|
| -}
|
| -
|
| -TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Scroll) {
|
| - VideoQualityTest::Params config = {
|
| - {1850, 1110 / 2, 5, 50000, 200000, 2000000, "VP8", 2, 400000},
|
| - {},
|
| - {true, 10, 2},
|
| - {"screenshare_slides_scrolling", 0.0, 0.0, kFullStackTestDurationSecs}};
|
| - RunTest(config);
|
| -}
|
| +TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Master_0) SCREENSHARE_VP8_2TL;
|
| +TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Master_1) SCREENSHARE_VP8_2TL;
|
| +TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Master_2) SCREENSHARE_VP8_2TL;
|
| +TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Master_3) SCREENSHARE_VP8_2TL;
|
| +TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Master_4) SCREENSHARE_VP8_2TL;
|
| +TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Master_5) SCREENSHARE_VP8_2TL;
|
| +TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Master_6) SCREENSHARE_VP8_2TL;
|
| +TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Master_7) SCREENSHARE_VP8_2TL;
|
| +TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Master_8) SCREENSHARE_VP8_2TL;
|
| +TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Master_9) SCREENSHARE_VP8_2TL;
|
|
|
| -TEST_F(FullStackTest, ScreenshareSlidesVP9_2TL) {
|
| - VideoQualityTest::Params screenshare = {
|
| - {1850, 1110, 5, 50000, 200000, 2000000, "VP9", 2, 400000},
|
| - {},
|
| - {true, 10},
|
| - {"screenshare_slides_vp9_2tl", 0.0, 0.0, kFullStackTestDurationSecs}};
|
| - RunTest(screenshare);
|
| -}
|
| } // namespace webrtc
|
|
|