Revert of Separating video settings in VideoQualityTest.

webrtc/video/video_quality_test.h

Index: webrtc/video/video_quality_test.h
diff --git a/webrtc/video/video_quality_test.h b/webrtc/video/video_quality_test.h
index d940bccbf3a94da270a96564669e4881fa285dfd..e5c85aa2312f58ce0e5b90c9109bbe2a51b75f7a 100644
--- a/webrtc/video/video_quality_test.h
+++ b/webrtc/video/video_quality_test.h
@@ -28,11 +28,6 @@
   // which makes the implementation of VideoQualityTest a bit uglier.
   struct Params {
     struct {
-      bool send_side_bwe;
-      Call::Config::BitrateConfig call_bitrate_config;
-    } call;
-    struct {
-      bool enabled;
       size_t width;
       size_t height;
       int32_t fps;
@@ -44,19 +39,20 @@
       int num_temporal_layers;
       int selected_tl;
       int min_transmit_bps;
+      bool send_side_bwe;
       bool fec;
+
+      Call::Config::BitrateConfig call_bitrate_config;
+    } common;
+    struct {  // Video-specific settings.
       std::string clip_name;
     } video;
-    struct {
-      bool enabled;
-      bool sync_video;
-    } audio;
-    struct {
+    struct {  // Screenshare-specific settings.
       bool enabled;
       int32_t slide_change_interval;
       int32_t scroll_duration;
     } screenshare;
-    struct {
+    struct {  // Analyzer settings.
       std::string test_label;
       double avg_psnr_threshold;  // (*)
       double avg_ssim_threshold;  // (*)
@@ -74,6 +70,8 @@
       // If empty, bitrates are generated in VP9Impl automatically.
       std::vector<SpatialLayer> spatial_layers;
     } ss;
+    bool audio;
+    bool audio_video_sync;
   };
   // (*) Set to -1.1 if generating graph data for simulcast or SVC and the
   // selected stream/layer doesn't have the same resolution as the largest