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/fakemediaengine.h

diff --git a/talk/media/base/fakemediaengine.h b/talk/media/base/fakemediaengine.h
index 20257e2..6cd1791 100644
--- a/talk/media/base/fakemediaengine.h
+++ b/talk/media/base/fakemediaengine.h
@@ -452,8 +452,9 @@
   const std::vector<VideoCodec>& codecs() const { return send_codecs(); }
   bool rendering() const { return playout(); }
   const VideoOptions& options() const { return options_; }
-  const std::map<uint32_t, VideoRenderer*>& renderers() const {
-    return renderers_;
+  const std::map<uint32_t, rtc::VideoSinkInterface<VideoFrame>*>& sinks()
+      const {
+    return sinks_;
   }
   int max_bps() const { return max_bps_; }
   virtual bool SetSendParameters(const VideoSendParameters& params) {
@@ -481,12 +482,13 @@
     *send_codec = send_codecs_[0];
     return true;
   }
-  virtual bool SetRenderer(uint32_t ssrc, VideoRenderer* r) {
-    if (ssrc != 0 && renderers_.find(ssrc) == renderers_.end()) {
+  bool SetSink(uint32_t ssrc,
+               rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override {
+    if (ssrc != 0 && sinks_.find(ssrc) == sinks_.end()) {
       return false;
     }
     if (ssrc != 0) {
-      renderers_[ssrc] = r;
+      sinks_[ssrc] = sink;
     }
     return true;
   }
@@ -512,13 +514,13 @@
   virtual bool AddRecvStream(const StreamParams& sp) {
     if (!RtpHelper<VideoMediaChannel>::AddRecvStream(sp))
       return false;
-    renderers_[sp.first_ssrc()] = NULL;
+    sinks_[sp.first_ssrc()] = NULL;
     return true;
   }
   virtual bool RemoveRecvStream(uint32_t ssrc) {
     if (!RtpHelper<VideoMediaChannel>::RemoveRecvStream(ssrc))
       return false;
-    renderers_.erase(ssrc);
+    sinks_.erase(ssrc);
     return true;
   }
 
@@ -554,7 +556,7 @@
   FakeVideoEngine* engine_;
   std::vector<VideoCodec> recv_codecs_;
   std::vector<VideoCodec> send_codecs_;
-  std::map<uint32_t, VideoRenderer*> renderers_;
+  std::map<uint32_t, rtc::VideoSinkInterface<VideoFrame>*> sinks_;
   std::map<uint32_t, VideoCapturer*> capturers_;
   VideoOptions options_;
   int max_bps_;