Replace test::FrameGenerator::ChromaGenerator with new FrameGenerator::SquareGenerator

webrtc/video/video_quality_test.cc

 /*
  *  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.
  */
 #include "webrtc/video/video_quality_test.h"
@@ skipping 1227 matching lines @@
     const size_t kWidth = 1850;
     const size_t kHeight = 1110;
     std::vector<std::string> slides;
     slides.push_back(test::ResourcePath("web_screenshot_1850_1110", "yuv"));
     slides.push_back(test::ResourcePath("presentation_1850_1110", "yuv"));
     slides.push_back(test::ResourcePath("photo_1850_1110", "yuv"));
     slides.push_back(test::ResourcePath("difficult_photo_1850_1110", "yuv"));
 
     if (params_.screenshare.scroll_duration == 0) {
       // Cycle image every slide_change_interval seconds.
-      frame_generator_.reset(test::FrameGenerator::CreateFromYuvFile(
+      frame_generator_ = test::FrameGenerator::CreateFromYuvFile(
           slides, kWidth, kHeight,
-          params_.screenshare.slide_change_interval * params_.video.fps));
+          params_.screenshare.slide_change_interval * params_.video.fps);
     } else {
       RTC_CHECK_LE(params_.video.width, kWidth);
       RTC_CHECK_LE(params_.video.height, kHeight);
       RTC_CHECK_GT(params_.screenshare.slide_change_interval, 0);
       const int kPauseDurationMs = (params_.screenshare.slide_change_interval -
                                     params_.screenshare.scroll_duration) *
                                    1000;
       RTC_CHECK_LE(params_.screenshare.scroll_duration,
                    params_.screenshare.slide_change_interval);
 
-      frame_generator_.reset(
-          test::FrameGenerator::CreateScrollingInputFromYuvFiles(
-              clock_, slides, kWidth, kHeight, params_.video.width,
-              params_.video.height, params_.screenshare.scroll_duration * 1000,
-              kPauseDurationMs));
+      frame_generator_ = test::FrameGenerator::CreateScrollingInputFromYuvFiles(
+          clock_, slides, kWidth, kHeight, params_.video.width,
+          params_.video.height, params_.screenshare.scroll_duration * 1000,
+          kPauseDurationMs);
     }
   } else if (params_.ss.num_spatial_layers > 1) {  // For non-screenshare case.
     RTC_CHECK(params_.video.codec == "VP9");
     VideoCodecVP9 vp9_settings = VideoEncoder::GetDefaultVp9Settings();
     vp9_settings.numberOfTemporalLayers =
         static_cast<unsigned char>(params_.video.num_temporal_layers);
     vp9_settings.numberOfSpatialLayers =
         static_cast<unsigned char>(params_.ss.num_spatial_layers);
     video_encoder_config_.encoder_specific_settings = new rtc::RefCountedObject<
         VideoEncoderConfig::Vp9EncoderSpecificSettings>(vp9_settings);
   }
 }
 
 void VideoQualityTest::CreateCapturer() {
   if (params_.screenshare.enabled) {
     test::FrameGeneratorCapturer* frame_generator_capturer =
-        new test::FrameGeneratorCapturer(clock_, frame_generator_.release(),
+        new test::FrameGeneratorCapturer(clock_, std::move(frame_generator_),
                                          params_.video.fps);
     EXPECT_TRUE(frame_generator_capturer->Init());
     video_capturer_.reset(frame_generator_capturer);
   } else {
     if (params_.video.clip_name.empty()) {
       video_capturer_.reset(test::VcmCapturer::Create(
           params_.video.width, params_.video.height, params_.video.fps));
       if (!video_capturer_) {
         // Failed to get actual camera, use chroma generator as backup.
         video_capturer_.reset(test::FrameGeneratorCapturer::Create(
-            params_.video.width, params_.video.height, params_.video.fps,
-            clock_));
+            static_cast<int>(params_.video.width),
+            static_cast<int>(params_.video.height), params_.video.fps, clock_));
       }
     } else {
       video_capturer_.reset(test::FrameGeneratorCapturer::CreateFromYuvFile(
           test::ResourcePath(params_.video.clip_name, "yuv"),
           params_.video.width, params_.video.height, params_.video.fps,
           clock_));
       ASSERT_TRUE(video_capturer_) << "Could not create capturer for "
                                    << params_.video.clip_name
                                    << ".yuv. Is this resource file present?";
     }
@@ skipping 299 matching lines @@
     std::ostringstream str;
     str << receive_logs_++;
     std::string path =
         params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
     stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
                                         10000000);
   }
 }
 
 }  // namespace webrtc