Reland of Adding audio to video_quality_test.

webrtc/video/video_loopback.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 173 matching lines @@
 }
 
 DEFINE_bool(logs, false, "print logs to stderr");
 
 DEFINE_bool(send_side_bwe, true, "Use send-side bandwidth estimation");
 
 DEFINE_bool(allow_reordering, false, "Allow packet reordering to occur");
 
 DEFINE_bool(use_fec, false, "Use forward error correction.");
 
+DEFINE_bool(audio, false, "Add audio stream");
+
+DEFINE_bool(audio_video_sync, false, "Sync audio and video stream (no effect if"
+    " audio is false)");
+
 DEFINE_string(
     force_fieldtrials,
     "",
     "Field trials control experimental feature code which can be forced. "
     "E.g. running with --force_fieldtrials=WebRTC-FooFeature/Enable/"
     " will assign the group Enable to field trial WebRTC-FooFeature. Multiple "
     "trials are separated by \"/\"");
 
 // Video-specific flags.
 DEFINE_string(clip,
@@ skipping 13 matching lines @@
   pipe_config.queue_length_packets = flags::QueueSize();
   pipe_config.queue_delay_ms = flags::AvgPropagationDelayMs();
   pipe_config.delay_standard_deviation_ms = flags::StdPropagationDelayMs();
   pipe_config.allow_reordering = flags::FLAGS_allow_reordering;
 
   Call::Config::BitrateConfig call_bitrate_config;
   call_bitrate_config.min_bitrate_bps = flags::MinBitrateKbps() * 1000;
   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, flags::FLAGS_suspend_below_min_bitrate,
-       flags::Codec(), flags::NumTemporalLayers(), flags::SelectedTL(),
-       0,  // No min transmit bitrate.
-       flags::FLAGS_send_side_bwe, flags::FLAGS_use_fec, call_bitrate_config},
-      {flags::Clip()},
-      {},  // Screenshare specific.
-      {"video", 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, flags::FLAGS_suspend_below_min_bitrate,
+      flags::Codec(), flags::NumTemporalLayers(), flags::SelectedTL(),
+      0,  // No min transmit bitrate.
+      flags::FLAGS_send_side_bwe, flags::FLAGS_use_fec, call_bitrate_config};
+  params.video = {flags::Clip()};
+  params.analyzer = {"video", 0.0, 0.0, flags::DurationSecs(),
+      flags::OutputFilename(), flags::GraphTitle()};
+  params.pipe = pipe_config;
+  params.logs = flags::FLAGS_logs;
+  params.audio = flags::FLAGS_audio,
+  params.audio_video_sync = flags::FLAGS_audio_video_sync;
 
   std::vector<std::string> stream_descriptors;
   stream_descriptors.push_back(flags::Stream0());
   stream_descriptors.push_back(flags::Stream1());
   std::vector<std::string> SL_descriptors;
   SL_descriptors.push_back(flags::SL0());
   SL_descriptors.push_back(flags::SL1());
   VideoQualityTest::FillScalabilitySettings(
       &params, stream_descriptors, flags::SelectedStream(),
       flags::NumSpatialLayers(), flags::SelectedSL(), SL_descriptors);
 
   VideoQualityTest test;
   if (flags::DurationSecs()) {
     test.RunWithAnalyzer(params);
   } else {
-    test.RunWithVideoRenderer(params);
+    test.RunWithRenderers(params);
   }
 }
 }  // namespace webrtc
 
 int main(int argc, char* argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
   google::ParseCommandLineFlags(&argc, &argv, true);
   webrtc::test::InitFieldTrialsFromString(
       webrtc::flags::FLAGS_force_fieldtrials);
   webrtc::test::RunTest(webrtc::Loopback);
   return 0;
 }