commit 08582ff0754d906787ec93769a7ae9a8196ea7d8
author nisse <nisse@webrtc.org> Thu Feb 04 01:24:52 2016 -0800
committer Commit bot <commit-bot@chromium.org> Thu Feb 04 09:24:56 2016 +0000
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/media/base/mediachannel.h

diff --git a/talk/media/base/mediachannel.h b/talk/media/base/mediachannel.h
index dfd3be9..b72af4d 100644
--- a/talk/media/base/mediachannel.h
+++ b/talk/media/base/mediachannel.h
@@ -42,6 +42,7 @@
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/socket.h"
 #include "webrtc/base/window.h"
+#include "webrtc/media/base/videosinkinterface.h"
 // TODO(juberti): re-evaluate this include
 #include "talk/session/media/audiomonitor.h"
 
@@ -60,7 +61,7 @@
 class AudioRenderer;
 class ScreencastId;
 class VideoCapturer;
-class VideoRenderer;
+class VideoFrame;
 struct RtpHeader;
 struct VideoFormat;
 
@@ -982,7 +983,7 @@
     ERROR_PLAY_SRTP_REPLAY,               // Packet replay detected.
   };
 
-  VideoMediaChannel() : renderer_(NULL) {}
+  VideoMediaChannel() {}
   virtual ~VideoMediaChannel() {}
 
   virtual bool SetSendParameters(const VideoSendParameters& params) = 0;
@@ -995,17 +996,15 @@
   virtual bool SetVideoSend(uint32_t ssrc,
                             bool enable,
                             const VideoOptions* options) = 0;
-  // Sets the renderer object to be used for the specified stream.
+  // Sets the sink object to be used for the specified stream.
   // If SSRC is 0, the renderer is used for the 'default' stream.
-  virtual bool SetRenderer(uint32_t ssrc, VideoRenderer* renderer) = 0;
+  virtual bool SetSink(uint32_t ssrc,
+                       rtc::VideoSinkInterface<cricket::VideoFrame>* sink) = 0;
   // If |ssrc| is 0, replace the default capturer (engine capturer) with
   // |capturer|. If |ssrc| is non zero create a new stream with |ssrc| as SSRC.
   virtual bool SetCapturer(uint32_t ssrc, VideoCapturer* capturer) = 0;
   // Gets quality stats for the channel.
   virtual bool GetStats(VideoMediaInfo* info) = 0;
-
- protected:
-  VideoRenderer *renderer_;
 };
 
 enum DataMessageType {