Delete VideoFrameFactory, CapturedFrame, and related code.

webrtc/media/base/testutils.cc

 /*
  *  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 192 matching lines @@
         buf.Length() > dump->data.size() &&
         0 == memcmp(buf.Data(), &dump->data[0], dump->data.size());
   } else {
     return buf.Length() == dump->data.size() &&
         0 == memcmp(buf.Data(), &dump->data[0], dump->data.size());
   }
 }
 
 // Implementation of VideoCaptureListener.
 VideoCapturerListener::VideoCapturerListener(VideoCapturer* capturer)
-    : last_capture_state_(CS_STARTING),
+    : capturer_(capturer),
+      last_capture_state_(CS_STARTING),
       frame_count_(0),
-      frame_fourcc_(0),
       frame_width_(0),
       frame_height_(0),
-      frame_size_(0),
       resolution_changed_(false) {
   capturer->SignalStateChange.connect(this,
       &VideoCapturerListener::OnStateChange);
-  capturer->SignalFrameCaptured.connect(this,
-      &VideoCapturerListener::OnFrameCaptured);
+  capturer->AddOrUpdateSink(this, rtc::VideoSinkWants());
+}
+
+VideoCapturerListener::~VideoCapturerListener() {
+  capturer_->RemoveSink(this);
 }
 
 void VideoCapturerListener::OnStateChange(VideoCapturer* capturer,
                                           CaptureState result) {
   last_capture_state_ = result;
 }
 
-void VideoCapturerListener::OnFrameCaptured(VideoCapturer* capturer,
-                                            const CapturedFrame* frame) {
+void VideoCapturerListener::OnFrame(const VideoFrame& frame) {
   ++frame_count_;
   if (1 == frame_count_) {
-    frame_fourcc_ = frame->fourcc;
-    frame_width_ = frame->width;
-    frame_height_ = frame->height;
-    frame_size_ = frame->data_size;
-  } else if (frame_width_ != frame->width || frame_height_ != frame->height) {
+    frame_width_ = frame.width();
+    frame_height_ = frame.height();
+  } else if (frame_width_ != frame.width() || frame_height_ != frame.height()) {
     resolution_changed_ = true;
   }
 }
 
 cricket::StreamParams CreateSimStreamParams(
     const std::string& cname,
     const std::vector<uint32_t>& ssrcs) {
   cricket::StreamParams sp;
   cricket::SsrcGroup sg(cricket::kSimSsrcGroupSemantics, ssrcs);
   sp.ssrcs = ssrcs;
@@ skipping 13 matching lines @@
     std::vector<uint32_t> fid_ssrcs;
     fid_ssrcs.push_back(ssrcs[i]);
     fid_ssrcs.push_back(rtx_ssrcs[i]);
     cricket::SsrcGroup fid_group(cricket::kFidSsrcGroupSemantics, fid_ssrcs);
     sp.ssrc_groups.push_back(fid_group);
   }
   return sp;
 }
 
 }  // namespace cricket