commit f463c53b3230e74f6cb34ff31748658a4e5f338a
author minyue <minyue@webrtc.org> Thu Aug 18 13:28:55 2016
committer Commit bot <commit-bot@chromium.org> Thu Aug 18 13:28:59 2016
tree 6f24cdc91f83a99e2dc61e33d2aed9e5e581723d
parent 8d3d918a087609ca872c9542175cf3e0852faa3b

Reland of Adding audio to video_quality_test.

The original commit was https://codereview.webrtc.org/2136573002/.

BUG=

Review-Url: https://codereview.webrtc.org/2259783002
Cr-Original-Commit-Position: refs/heads/master@{#13818}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 732086609177d0e657cc7bc96737db7117e72cec

video/screenshare_loopback.cc

diff --git a/video/screenshare_loopback.cc b/video/screenshare_loopback.cc
index 05ebc2e..82e51dd 100644
--- a/video/screenshare_loopback.cc
+++ b/video/screenshare_loopback.cc
@@ -223,19 +223,21 @@
   call_bitrate_config.start_bitrate_bps = flags::StartBitrateKbps() * 1000;
   call_bitrate_config.max_bitrate_bps = flags::MaxBitrateKbps() * 1000;
 
-  VideoQualityTest::Params params{
-      {flags::Width(), flags::Height(), flags::Fps(),
-       flags::MinBitrateKbps() * 1000, flags::TargetBitrateKbps() * 1000,
-       flags::MaxBitrateKbps() * 1000, false, flags::Codec(),
-       flags::NumTemporalLayers(), flags::SelectedTL(),
-       flags::MinTransmitBitrateKbps() * 1000, flags::FLAGS_send_side_bwe,
-       false, call_bitrate_config},
-      {},  // Video specific.
-      {true, flags::SlideChangeInterval(), flags::ScrollDuration()},
-      {"screenshare", 0.0, 0.0, flags::DurationSecs(), flags::OutputFilename(),
-       flags::GraphTitle()},
-      pipe_config,
-      flags::FLAGS_logs};
+  VideoQualityTest::Params params;
+  params.common = {flags::Width(), flags::Height(), flags::Fps(),
+      flags::MinBitrateKbps() * 1000, flags::TargetBitrateKbps() * 1000,
+      flags::MaxBitrateKbps() * 1000, false, flags::Codec(),
+      flags::NumTemporalLayers(), flags::SelectedTL(),
+      flags::MinTransmitBitrateKbps() * 1000, flags::FLAGS_send_side_bwe,
+      false, call_bitrate_config};
+  params.screenshare = {true, flags::SlideChangeInterval(),
+      flags::ScrollDuration()};
+  params.analyzer = {"screenshare", 0.0, 0.0, flags::DurationSecs(),
+      flags::OutputFilename(), flags::GraphTitle()};
+  params.pipe = pipe_config;
+  params.logs = flags::FLAGS_logs;
+  params.audio = false;
+  params.audio_video_sync = false;
 
   std::vector<std::string> stream_descriptors;
   stream_descriptors.push_back(flags::Stream0());
@@ -251,7 +253,7 @@
   if (flags::DurationSecs()) {
     test.RunWithAnalyzer(params);
   } else {
-    test.RunWithVideoRenderer(params);
+    test.RunWithRenderers(params);
   }
 }
 }  // namespace webrtc