Revert 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 e5bedf4998e9e069371510f26fcba3541d1851e4..10998c8867131362d26cd0b18c49921204f9877d 100644
--- a/webrtc/video/video_loopback.cc
+++ b/webrtc/video/video_loopback.cc
@@ -230,26 +230,19 @@
   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::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, 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());