Revert of "Separating video settings in VideoQualityTest".

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 219 matching lines @@
   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;
-  params.call = {flags::FLAGS_send_side_bwe, call_bitrate_config};
-  params.video = {true,
-                  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_use_fec,
-                  flags::EncodedFramePath(),
-                  flags::Clip()};
-  params.audio = {flags::FLAGS_audio, flags::FLAGS_audio_video_sync};
+  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,
+                   flags::EncodedFramePath(),
+                   call_bitrate_config};
+  params.video = {flags::Clip()};
   params.screenshare.enabled = false;
   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.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;
 }