Revert of Separating video settings in VideoQualityTest.

webrtc/video/video_quality_test.h

 /*
  *  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.
  */
 #ifndef WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_
@@ skipping 10 matching lines @@
 namespace webrtc {
 
 class VideoQualityTest : public test::CallTest {
  public:
   // Parameters are grouped into smaller structs to make it easier to set
   // the desired elements and skip unused, using aggregate initialization.
   // Unfortunately, C++11 (as opposed to C11) doesn't support unnamed structs,
   // 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;
       int min_bitrate_bps;
       int target_bitrate_bps;
       int max_bitrate_bps;
       bool suspend_below_min_bitrate;
       std::string codec;
       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;  // (*)
       int test_durations_secs;
       std::string graph_data_output_filename;
       std::string graph_title;
     } analyzer;
     FakeNetworkPipe::Config pipe;
     bool logs;
     struct {  // Spatial scalability.
       std::vector<VideoStream> streams;  // If empty, one stream is assumed.
       size_t selected_stream;
       int num_spatial_layers;
       int selected_sl;
       // 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
   // stream/layer (to ignore the PSNR and SSIM calculation errors).
 
   VideoQualityTest();
   void RunWithAnalyzer(const Params& params);
   void RunWithRenderers(const Params& params);
 
   static void FillScalabilitySettings(
@@ skipping 29 matching lines @@
   std::unique_ptr<VideoEncoder> encoder_;
   VideoCodecUnion codec_settings_;
   Clock* const clock_;
 
   Params params_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_