Reland of Adding audio to video_quality_test.

webrtc/video/screenshare_loopback.cc

Index: webrtc/video/screenshare_loopback.cc
diff --git a/webrtc/video/screenshare_loopback.cc b/webrtc/video/screenshare_loopback.cc
index 05ebc2e02f6288681731c7e23ca0a1411cdbe69d..82e51dd9398ef75595a0008f59745a7d2b16419a 100644
--- a/webrtc/video/screenshare_loopback.cc
+++ b/webrtc/video/screenshare_loopback.cc
@@ -223,19 +223,21 @@ void Loopback() {
   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 @@ void Loopback() {
   if (flags::DurationSecs()) {
     test.RunWithAnalyzer(params);
   } else {
-    test.RunWithVideoRenderer(params);
+    test.RunWithRenderers(params);
   }
 }
 }  // namespace webrtc