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

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 60 matching lines @@
     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;
+    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);
   void RunWithRenderers(const Params& params);
 
   static void FillScalabilitySettings(
       Params* params,
       const std::vector<std::string>& stream_descriptors,
       size_t selected_stream,
       int num_spatial_layers,
       int selected_sl,
       const std::vector<std::string>& sl_descriptors);
 
  protected:
   // No-op implementation to be able to instantiate this class from non-TEST_F
   // locations.
   void TestBody() override;
 
   // Helper methods accessing only params_.
   std::string GenerateGraphTitle() const;
   void CheckParams();
 
   // 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,
                   Call* call,
                   Transport* transport,
                   AudioReceiveStream** audio_receive_stream);
 
   void StartEncodedFrameLogs(VideoSendStream* stream);
   void StartEncodedFrameLogs(VideoReceiveStream* stream);
 
   // 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_;
   int send_logs_;
 
   VideoSendStream::DegradationPreference degradation_preference_ =
       VideoSendStream::DegradationPreference::kBalanced;
   Params params_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_