Reland of Adding audio to video_quality_test.

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 9c7f0e7e1dc777c02760b307ef192bcde5c81bda..e5c85aa2312f58ce0e5b90c9109bbe2a51b75f7a 100644
--- a/webrtc/video/video_quality_test.h
+++ b/webrtc/video/video_quality_test.h
@@ -62,7 +62,7 @@ class VideoQualityTest : public test::CallTest {
     } analyzer;
     FakeNetworkPipe::Config pipe;
     bool logs;
-    struct {                             // Spatial scalability.
+    struct {  // Spatial scalability.
       std::vector<VideoStream> streams;  // If empty, one stream is assumed.
       size_t selected_stream;
       int num_spatial_layers;
@@ -70,6 +70,8 @@ class VideoQualityTest : public test::CallTest {
       // 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
@@ -77,7 +79,7 @@ class VideoQualityTest : public test::CallTest {
 
   VideoQualityTest();
   void RunWithAnalyzer(const Params& params);
-  void RunWithVideoRenderer(const Params& params);
+  void RunWithRenderers(const Params& params);
 
   static void FillScalabilitySettings(
       Params* params,