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

talk/media/base/fakemediaengine.h

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 434 matching lines @@
     SetOptions(options);
   }
 
   ~FakeVideoMediaChannel();
 
   const std::vector<VideoCodec>& recv_codecs() const { return recv_codecs_; }
   const std::vector<VideoCodec>& send_codecs() const { return send_codecs_; }
   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) {
     return (SetSendCodecs(params.codecs) &&
             SetSendRtpHeaderExtensions(params.extensions) &&
             SetMaxSendBandwidth(params.max_bandwidth_bps) &&
             SetOptions(params.options));
   }
 
   virtual bool SetRecvParameters(const VideoRecvParameters& params) {
     return (SetRecvCodecs(params.codecs) &&
             SetRecvRtpHeaderExtensions(params.extensions));
   }
   virtual bool AddSendStream(const StreamParams& sp) {
     return RtpHelper<VideoMediaChannel>::AddSendStream(sp);
   }
   virtual bool RemoveSendStream(uint32_t ssrc) {
     return RtpHelper<VideoMediaChannel>::RemoveSendStream(ssrc);
   }
 
   virtual bool GetSendCodec(VideoCodec* send_codec) {
     if (send_codecs_.empty()) {
       return false;
     }
     *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;
   }
 
   virtual bool SetSend(bool send) { return set_sending(send); }
   virtual bool SetVideoSend(uint32_t ssrc, bool enable,
                             const VideoOptions* options) {
     if (!RtpHelper<VideoMediaChannel>::MuteStream(ssrc, !enable)) {
       return false;
     }
     if (enable && options) {
       return SetOptions(*options);
     }
     return true;
   }
   virtual bool SetCapturer(uint32_t ssrc, VideoCapturer* capturer) {
     capturers_[ssrc] = capturer;
     return true;
   }
   bool HasCapturer(uint32_t ssrc) const {
     return capturers_.find(ssrc) != capturers_.end();
   }
   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;
   }
 
   virtual bool GetStats(VideoMediaInfo* info) { return false; }
 
  private:
   bool SetRecvCodecs(const std::vector<VideoCodec>& codecs) {
     if (fail_set_recv_codecs()) {
       // Fake the failure in SetRecvCodecs.
       return false;
@@ skipping 15 matching lines @@
     return true;
   }
   bool SetMaxSendBandwidth(int bps) {
     max_bps_ = bps;
     return true;
   }
 
   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_;
 };
 
 class FakeDataMediaChannel : public RtpHelper<DataMediaChannel> {
  public:
   explicit FakeDataMediaChannel(void* unused, const DataOptions& options)
       : send_blocked_(false), max_bps_(-1) {}
   ~FakeDataMediaChannel() {}
@@ skipping 321 matching lines @@
 
  private:
   std::vector<FakeDataMediaChannel*> channels_;
   std::vector<DataCodec> data_codecs_;
   DataChannelType last_channel_type_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_