Delete VideoFrameFactory, CapturedFrame, and related code.

webrtc/media/base/testutils.h

 /*
  *  Copyright (c) 2004 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.
  */
 
@@ skipping 96 matching lines @@
   static const uint32_t kDefaultTimeIncrease = 30;
   static const uint32_t kElapsedTimeInterval = 10;
   static const RawRtpPacket kTestRawRtpPackets[];
   static const RawRtcpPacket kTestRawRtcpPackets[];
 
  private:
   RtpTestUtility() {}
 };
 
 // Test helper for testing VideoCapturer implementations.
-class VideoCapturerListener : public sigslot::has_slots<> {
+class VideoCapturerListener
+    : public sigslot::has_slots<>,
+      public rtc::VideoSinkInterface<cricket::VideoFrame> {
  public:
   explicit VideoCapturerListener(VideoCapturer* cap);
+  ~VideoCapturerListener();
 
   CaptureState last_capture_state() const { return last_capture_state_; }
   int frame_count() const { return frame_count_; }
-  uint32_t frame_fourcc() const { return frame_fourcc_; }
   int frame_width() const { return frame_width_; }
   int frame_height() const { return frame_height_; }
-  uint32_t frame_size() const { return frame_size_; }
   bool resolution_changed() const { return resolution_changed_; }
 
   void OnStateChange(VideoCapturer* capturer, CaptureState state);
-  void OnFrameCaptured(VideoCapturer* capturer, const CapturedFrame* frame);
+  void OnFrame(const VideoFrame& frame) override;
 
  private:
+  VideoCapturer* capturer_;
   CaptureState last_capture_state_;
   int frame_count_;
-  uint32_t frame_fourcc_;
   int frame_width_;
   int frame_height_;
-  uint32_t frame_size_;
   bool resolution_changed_;
 };
 
 class ScreencastEventCatcher : public sigslot::has_slots<> {
  public:
   ScreencastEventCatcher() : ssrc_(0), ev_(rtc::WE_RESIZE) { }
   uint32_t ssrc() const { return ssrc_; }
   rtc::WindowEvent event() const { return ev_; }
   void OnEvent(uint32_t ssrc, rtc::WindowEvent ev) {
     ssrc_ = ssrc;
@@ skipping 36 matching lines @@
 // Create Simulcast stream with given |ssrcs| and |rtx_ssrcs|.
 // The number of |rtx_ssrcs| must match number of |ssrcs|.
 cricket::StreamParams CreateSimWithRtxStreamParams(
     const std::string& cname,
     const std::vector<uint32_t>& ssrcs,
     const std::vector<uint32_t>& rtx_ssrcs);
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_TESTUTILS_H_