Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/video/full_stack_tests.cc

Issue 3003193002: Add a new frame generator that cycles through randomly generated slides. (Closed)
Patch Set: Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webrtc/test/frame_generator.cc ('K') | « webrtc/test/frame_generator_unittest.cc ('k') | webrtc/video/screenshare_loopback.cc » ('j') | webrtc/video/screenshare_loopback.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/full_stack_tests.cc
diff --git a/webrtc/video/full_stack_tests.cc b/webrtc/video/full_stack_tests.cc
index 8190bf6cb5290394d89640c1185d2a46b6148817..32fce3570ed876704e3775eff6e296226f3fcdf6 100644
--- a/webrtc/video/full_stack_tests.cc
+++ b/webrtc/video/full_stack_tests.cc
@@ -342,30 +342,69 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL) {
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
erikvarga1 2017/08/23 14:41:25 I added these to have some integration tests where
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),
@@ -379,7 +418,7 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Scroll) {
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);
@@ -390,7 +429,7 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_LossyNet) {
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;
@@ -404,7 +443,7 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_VeryLossyNet) {
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;
@@ -418,7 +457,7 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_LossyNetRestrictedQueue) {
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;
@@ -433,7 +472,7 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_ModeratelyRestricted) {
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;
@@ -450,7 +489,7 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_LossyNetRestrictedQueue_ALR) {
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;
@@ -466,7 +505,7 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_ALR) {
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);
@@ -478,7 +517,7 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_ModeratelyRestricted_ALR) {
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;
@@ -493,7 +532,7 @@ TEST_F(FullStackTest, ScreenshareSlidesVP8_3TL_Simulcast_ALR) {
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, ""};
@@ -541,7 +580,7 @@ TEST_F(FullStackTest, ScreenshareSlidesVP9_2SL) {
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,
« webrtc/test/frame_generator.cc ('K') | « webrtc/test/frame_generator_unittest.cc ('k') | webrtc/video/screenshare_loopback.cc » ('j') | webrtc/video/screenshare_loopback.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698