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 24320eb7ab167b0c0b04b6178e46480a4e0c7251..cd4939de7f3522b7c6f225cb3f1ddd98e4b4c2b0 100644
--- a/webrtc/video/video_quality_test.h
+++ b/webrtc/video/video_quality_test.h
@@ -27,14 +27,7 @@
   // Unfortunately, C++11 (as opposed to C11) doesn't support unnamed structs,
   // which makes the implementation of VideoQualityTest a bit uglier.
   struct Params {
-    Params();
-    ~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;
@@ -46,20 +39,21 @@
       int num_temporal_layers;
       int selected_tl;
       int min_transmit_bps;
+      bool send_side_bwe;
       bool fec;
       std::string encoded_frame_base_path;
+
+      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;  // (*)
@@ -77,6 +71,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