Make cricket::VideoCapturer implement VideoSourceInterface

webrtc/media/base/capturerenderadapter.h

 /*
  *  Copyright (c) 2012 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 11 matching lines @@
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/media/base/videosinkinterface.h"
 
 namespace cricket {
 
 class VideoCapturer;
 class VideoProcessor;
 
-class CaptureRenderAdapter : public sigslot::has_slots<> {
+// TODO(perkj): Considering removing CaptureRenderAdapter and replace it by
+// directly using cricket::VideoCapturer::AddSink.
+class CaptureRenderAdapter : public rtc::VideoSinkInterface<VideoFrame> {

[pthatcher1, 2016/02/08 20:59:39]

This seems exactly like the VideoBroadcaster.  Can we either replace every
instance of CaptureRenderAdapter with VideoBroadcaster, or just use
VideoBroadcaster in the implementation of this?

[perkj_webrtc, 2016/02/09 13:23:57]

I had planned to do that in a follow up. But sure- now removed.

  public:
   static CaptureRenderAdapter* Create(VideoCapturer* video_capturer);
   ~CaptureRenderAdapter();
 
   void AddSink(rtc::VideoSinkInterface<VideoFrame>* sink);
   void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink);
 
   VideoCapturer* video_capturer() { return video_capturer_; }
+
  private:
-
   explicit CaptureRenderAdapter(VideoCapturer* video_capturer);
   void Init();
 
   // Callback for frames received from the capturer.
-  void OnVideoFrame(VideoCapturer* capturer, const VideoFrame* video_frame);
+  void OnFrame(const VideoFrame& frame) override;
 
   // Just pointers since ownership is not handed over to this class.
   std::vector<rtc::VideoSinkInterface<VideoFrame>*> sinks_;
   VideoCapturer* video_capturer_;
   // Critical section synchronizing the capture thread.
   rtc::CriticalSection capture_crit_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_CAPTURERENDERADAPTER_H_