commit 08582ff0754d906787ec93769a7ae9a8196ea7d8
author nisse <nisse@webrtc.org> Thu Feb 04 09:24:52 2016
committer Commit bot <commit-bot@chromium.org> Thu Feb 04 09:24:56 2016
tree dfdff1502d740d45de505d8d467cbf76e7bf4204
parent 8cb910d2fd5fb42b906db02de68d800fb4bc846d

Replace uses of cricket::VideoRenderer by rtc::VideoSinkInterface.

Change argument type for VideoProviderInterface::SetVideoPlayout.

Replace VideoMediaChannel::SetRenderer and VideoChannel::SetRenderer
by SetSink.

Alse deleted unused member variables VideoMediaChannel::renderer_ and
VideoChannel::renderer_.

BUG=webrtc:5426

Review URL: https://codereview.webrtc.org/1668493002

Cr-Commit-Position: refs/heads/master@{#11485}

talk/session/media/channel.cc

diff --git a/talk/session/media/channel.cc b/talk/session/media/channel.cc
index 5a5aca6..592f22d 100644
--- a/talk/session/media/channel.cc
+++ b/talk/session/media/channel.cc
@@ -1650,7 +1650,6 @@
                   transport_controller,
                   content_name,
                   rtcp),
-      renderer_(NULL),
       previous_we_(rtc::WE_CLOSE) {}
 
 bool VideoChannel::Init() {
@@ -1679,9 +1678,10 @@
   Deinit();
 }
 
-bool VideoChannel::SetRenderer(uint32_t ssrc, VideoRenderer* renderer) {
-  worker_thread()->Invoke<void>(Bind(
-      &VideoMediaChannel::SetRenderer, media_channel(), ssrc, renderer));
+bool VideoChannel::SetSink(uint32_t ssrc,
+                           rtc::VideoSinkInterface<VideoFrame>* sink) {
+  worker_thread()->Invoke<void>(
+      Bind(&VideoMediaChannel::SetSink, media_channel(), ssrc, sink));
   return true;
 }
 

talk/session/media/channel.h

diff --git a/talk/session/media/channel.h b/talk/session/media/channel.h
index de66e9c..a05828b 100644
--- a/talk/session/media/channel.h
+++ b/talk/session/media/channel.h
@@ -50,6 +50,7 @@
 #include "webrtc/base/network.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/window.h"
+#include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/p2p/base/transportcontroller.h"
 #include "webrtc/p2p/client/socketmonitor.h"
 
@@ -454,7 +455,7 @@
     return static_cast<VideoMediaChannel*>(BaseChannel::media_channel());
   }
 
-  bool SetRenderer(uint32_t ssrc, VideoRenderer* renderer);
+  bool SetSink(uint32_t ssrc, rtc::VideoSinkInterface<VideoFrame>* sink);
 
   // TODO(pthatcher): Refactor to use a "capture id" instead of an
   // ssrc here as the "key".
@@ -507,7 +508,6 @@
   virtual void OnStateChange(VideoCapturer* capturer, CaptureState ev);
   bool GetLocalSsrc(const VideoCapturer* capturer, uint32_t* ssrc);
 
-  VideoRenderer* renderer_;
   ScreencastMap screencast_capturers_;
   rtc::scoped_ptr<VideoMediaMonitor> media_monitor_;