Added large room scenario to full-stack tests. Added thumbnail streams functionality to call test/v…

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 11dd28b0c53c7fb8783f4a5646074d5641abf7b2..2fecf48ffefd431c433f9b9d15b0498d82f288cd 100644
--- a/webrtc/video/video_quality_test.h
+++ b/webrtc/video/video_quality_test.h
@@ -78,10 +78,8 @@ class VideoQualityTest : public test::CallTest {
       // If empty, bitrates are generated in VP9Impl automatically.
       std::vector<SpatialLayer> spatial_layers;
     } ss;
+    int num_thumbnails;
   };
-  // (*) Set to -1.1 if generating graph data for simulcast or SVC and the

[kjellander_webrtc, 2017/03/06 12:02:44]

Why remove this? Is it not correct?

[ilnik, 2017/03/06 12:04:18]

Not relevant anymore since now upscaling is implemented for PSNR and SSIM
computation.

-  // 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);
@@ -106,11 +104,14 @@ class VideoQualityTest : public test::CallTest {
 
   // Helper static methods.
   static VideoStream DefaultVideoStream(const Params& params);
+  static VideoStream DefaultThumbnailStream();
   static std::vector<int> ParseCSV(const std::string& str);
 
   // Helper methods for setting up the call.
   void CreateCapturer();
+  void SetupThumbnailCapturers(size_t num_thumbnail_streams);
   void SetupVideo(Transport* send_transport, Transport* recv_transport);
+  void SetupThumbnails(Transport* send_transport, Transport* recv_transport);
   void SetupScreenshareOrSVC();
   void SetupAudio(int send_channel_id,
                   int receive_channel_id,
@@ -123,9 +124,15 @@ class VideoQualityTest : public test::CallTest {
 
   // We need a more general capturer than the FrameGeneratorCapturer.
   std::unique_ptr<test::VideoCapturer> video_capturer_;
+  std::vector<std::unique_ptr<test::VideoCapturer> > thumbnail_capturers_;

[sprang_webrtc, 2017/03/06 12:27:23]

nit: Don't actually need the space in >> anymore

[ilnik, 2017/03/06 12:35:10]

Done.

   std::unique_ptr<test::TraceToStderr> trace_to_stderr_;
   std::unique_ptr<test::FrameGenerator> frame_generator_;
   std::unique_ptr<VideoEncoder> video_encoder_;
+  std::vector<std::unique_ptr<VideoEncoder> > thumbnail_encoders_;
+  std::vector<VideoSendStream::Config> thumbnail_send_configs_;
+  std::vector<VideoEncoderConfig> thumbnail_encoder_configs_;
+  std::vector<VideoSendStream*> thumbnail_send_streams_;

[sprang_webrtc, 2017/03/06 12:27:23]

The vectors need to match, right? Can we use a single vector of struct for these
instead?

[ilnik, 2017/03/06 12:35:10]

They match by how they are created. I don't think merging these together will
justify reduced readability.

+
   Clock* const clock_;
 
   int receive_logs_;