commit 96faaded63b5c4cebc093b78c302f03814764fa4
author ivica <ivica@webrtc.org> Tue Sep 22 12:47:27 2015
committer Commit bot <commit-bot@chromium.org> Tue Sep 22 12:47:34 2015
tree 5b02c6e42cb6444aec80bf79c3d6e9ce3ed5b33e
parent ea67c4e1d3d5a960a89ca207266adc241554c8a6

Using static frame generator when no scrolling

In screensharing full stack tests, instead of using YuvFileGenerator by default
when no scrolling is used, I always used ScrollingImageFileGenerator.
That possibly slowed down the test a little bit, at least for the slowed
devices, as it unnecessarily copied few MBs per frame.

BUG=chromium:534220

Review URL: https://codereview.webrtc.org/1359783002

Cr-Original-Commit-Position: refs/heads/master@{#10014}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: d4818e73042bc2402256977884c04d96084327fb

video/video_quality_test.cc

diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc
index cbd1e60..5837660 100644
--- a/video/video_quality_test.cc
+++ b/video/video_quality_test.cc
@@ -677,11 +677,17 @@
     RTC_CHECK_LE(params.screenshare.scroll_duration,
                  params.screenshare.slide_change_interval);
 
-    frame_generator_.reset(
-        test::FrameGenerator::CreateScrollingInputFromYuvFiles(
-            clock_, slides, kWidth, kHeight, params.common.width,
-            params.common.height, params.screenshare.scroll_duration * 1000,
-            kPauseDurationMs));
+    if (params.screenshare.scroll_duration) {
+      frame_generator_.reset(
+          test::FrameGenerator::CreateScrollingInputFromYuvFiles(
+              clock_, slides, kWidth, kHeight, params.common.width,
+              params.common.height, params.screenshare.scroll_duration * 1000,
+              kPauseDurationMs));
+    } else {
+      frame_generator_.reset(test::FrameGenerator::CreateFromYuvFile(
+              slides, kWidth, kHeight,
+              params.screenshare.slide_change_interval * params.common.fps));
+    }
   }
 }