New rtc::VideoSinkInterface.

talk/media/base/capturerenderadapter.h

Index: talk/media/base/capturerenderadapter.h
diff --git a/talk/media/base/capturerenderadapter.h b/talk/media/base/capturerenderadapter.h
index dda43f0871a17defc081c1e13d1290ec9ca0fd98..12a86a2de2b443478292a4f86204e1880c10cf1f 100644
--- a/talk/media/base/capturerenderadapter.h
+++ b/talk/media/base/capturerenderadapter.h
@@ -39,26 +39,26 @@
 #include "talk/media/base/videocapturer.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/sigslot.h"
+#include "webrtc/media/base/videosinkinterface.h"
 
 namespace cricket {
 
 class VideoCapturer;
 class VideoProcessor;
-class VideoRenderer;
 
 class CaptureRenderAdapter : public sigslot::has_slots<> {
  public:
   static CaptureRenderAdapter* Create(VideoCapturer* video_capturer);
   ~CaptureRenderAdapter();
 
-  void AddRenderer(VideoRenderer* video_renderer);
-  void RemoveRenderer(VideoRenderer* video_renderer);
+  void AddSink(rtc::VideoSinkInterface<VideoFrame>* sink);
+  void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink);
 
   VideoCapturer* video_capturer() { return video_capturer_; }
  private:
 
   // Just pointers since ownership is not handed over to this class.
-  typedef std::vector<VideoRenderer*> VideoRenderers;
+  typedef std::vector<rtc::VideoSinkInterface<VideoFrame>*> VideoSinks;

[pthatcher1, 2016/01/27 01:11:03]

Can you just remove this typedef?  It looks like it's only used two places, one
of which is a for loop that can use c++11-style for loops to avoid the need.

[nisse-webrtc, 2016/01/27 09:08:51]

Done.

 
   explicit CaptureRenderAdapter(VideoCapturer* video_capturer);
   void Init();
@@ -66,7 +66,7 @@ class CaptureRenderAdapter : public sigslot::has_slots<> {
   // Callback for frames received from the capturer.
   void OnVideoFrame(VideoCapturer* capturer, const VideoFrame* video_frame);
 
-  VideoRenderers video_renderers_;
+  VideoSinks sinks_;
   VideoCapturer* video_capturer_;
   // Critical section synchronizing the capture thread.
   mutable rtc::CriticalSection capture_crit_;