Reland of "Separating video settings in VideoQualityTest".

webrtc/video/video_loopback.cc

Index: webrtc/video/video_loopback.cc
diff --git a/webrtc/video/video_loopback.cc b/webrtc/video/video_loopback.cc
index 1ccaf41b44eba4ade905d11378bee99eef002daa..a0c18790b16ea643c57e15be7c32a319e999bedd 100644
--- a/webrtc/video/video_loopback.cc
+++ b/webrtc/video/video_loopback.cc
@@ -237,29 +237,28 @@ void Loopback() {
   call_bitrate_config.max_bitrate_bps = flags::MaxBitrateKbps() * 1000;
 
   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,
-                   flags::EncodedFramePath(),
-                   call_bitrate_config};
-  params.video = {flags::Clip()};
+  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.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());