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

webrtc/test/frame_generator_capturer.cc

 /*
  *  Copyright (c) 2013 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/test/frame_generator_capturer.h"
 
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/platform_thread.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/system_wrappers/include/sleep.h"
 #include "webrtc/test/frame_generator.h"
 #include "webrtc/video_send_stream.h"
 
 namespace webrtc {
 namespace test {
 
-FrameGeneratorCapturer* FrameGeneratorCapturer::Create(size_t width,
-                                                       size_t height,
+FrameGeneratorCapturer* FrameGeneratorCapturer::Create(int width,
+                                                       int height,
                                                        int target_fps,
                                                        Clock* clock) {
   FrameGeneratorCapturer* capturer = new FrameGeneratorCapturer(
-      clock, FrameGenerator::CreateChromaGenerator(width, height), target_fps);
+      clock, FrameGenerator::CreateSquareGenerator(width, height), target_fps);
   if (!capturer->Init()) {
     delete capturer;
     return NULL;
   }
 
   return capturer;
 }
 
 FrameGeneratorCapturer* FrameGeneratorCapturer::CreateFromYuvFile(
     const std::string& file_name,
     size_t width,
     size_t height,
     int target_fps,
     Clock* clock) {
   FrameGeneratorCapturer* capturer = new FrameGeneratorCapturer(
       clock, FrameGenerator::CreateFromYuvFile(
                  std::vector<std::string>(1, file_name), width, height, 1),
       target_fps);
   if (!capturer->Init()) {
     delete capturer;
     return NULL;
   }
 
   return capturer;
 }
 
-FrameGeneratorCapturer::FrameGeneratorCapturer(Clock* clock,
-                                               FrameGenerator* frame_generator,
-                                               int target_fps)
+FrameGeneratorCapturer::FrameGeneratorCapturer(
+    Clock* clock,
+    std::unique_ptr<FrameGenerator> frame_generator,
+    int target_fps)
     : clock_(clock),
       sending_(false),
       sink_(nullptr),
       sink_wants_observer_(nullptr),
       tick_(EventTimerWrapper::Create()),
       thread_(FrameGeneratorCapturer::Run, this, "FrameGeneratorCapturer"),
-      frame_generator_(frame_generator),
+      frame_generator_(std::move(frame_generator)),
       target_fps_(target_fps),
       first_frame_capture_time_(-1) {
-  RTC_DCHECK(frame_generator);
+  RTC_DCHECK(frame_generator_);
   RTC_DCHECK_GT(target_fps, 0);
 }
 
 FrameGeneratorCapturer::~FrameGeneratorCapturer() {
   Stop();
 
   thread_.Stop();
 }
 
 void FrameGeneratorCapturer::SetFakeRotation(VideoRotation rotation) {
@@ skipping 72 matching lines @@
   rtc::CritScope cs(&lock_);
   RTC_CHECK(sink_ == sink);
   sink_ = nullptr;
 }
 
 void FrameGeneratorCapturer::ForceFrame() {
   tick_->Set();
 }
 }  // test
 }  // webrtc