Replace interface VideoCapturerInput with VideoSinkInterface.

webrtc/test/frame_generator.h

 /*
  *  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.
  */
-#ifndef WEBRTC_COMMON_VIDEO_TEST_FRAME_GENERATOR_H_
-#define WEBRTC_COMMON_VIDEO_TEST_FRAME_GENERATOR_H_
+#ifndef WEBRTC_TEST_FRAME_GENERATOR_H_
+#define WEBRTC_TEST_FRAME_GENERATOR_H_
 
 #include <string>
 #include <vector>
 
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/media/base/videosourceinterface.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video_frame.h"
 
 namespace webrtc {
 class Clock;
 namespace test {
 
+class FrameForwarder : public rtc::VideoSourceInterface<VideoFrame> {

[stefan-webrtc, 2016/09/13 09:26:43]

A short comment on the purpose of this class would be good.

[perkj_webrtc, 2016/09/14 14:20:22]

Done.

+ public:
+  FrameForwarder();
+  void IncomingCapturedFrame(const VideoFrame& video_frame);
+
+ private:
+  void AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
+                       const rtc::VideoSinkWants& wants) override;
+  void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) override;
+
+  rtc::CriticalSection crit_;
+  rtc::VideoSinkInterface<VideoFrame>* sink_ GUARDED_BY(crit_);
+};
+
 class FrameGenerator {
  public:
   FrameGenerator() {}
   virtual ~FrameGenerator() {}
 
   // Returns video frame that remains valid until next call.
   virtual VideoFrame* NextFrame() = 0;
 
   // Creates a test frame generator that creates fully saturated frames with
   // varying U, V values over time.
@@ skipping 21 matching lines @@
       size_t source_width,
       size_t source_height,
       size_t target_width,
       size_t target_height,
       int64_t scroll_time_ms,
       int64_t pause_time_ms);
 };
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // WEBRTC_COMMON_VIDEO_TEST_FRAME_GENERATOR_H_
+#endif  // WEBRTC_TEST_FRAME_GENERATOR_H_