Make WebRtcVideoChannel2::WebRtcVideoSendStream implement rtc::VideoRendererInterface.

talk/app/webrtc/mediastreaminterface.h

 /*
  * libjingle
  * Copyright 2012 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 22 matching lines @@
 
 #ifndef TALK_APP_WEBRTC_MEDIASTREAMINTERFACE_H_
 #define TALK_APP_WEBRTC_MEDIASTREAMINTERFACE_H_
 
 #include <string>
 #include <vector>
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/media/base/videosinkinterface.h"
 
 namespace cricket {
 
 class AudioRenderer;
 class VideoCapturer;
 class VideoRenderer;
 class VideoFrame;
 
 }  // namespace cricket
 
@@ skipping 56 matching lines @@
   virtual TrackState state() const = 0;
   virtual bool set_enabled(bool enable) = 0;
   // These methods should be called by implementation only.
   virtual bool set_state(TrackState new_state) = 0;
 
  protected:
   virtual ~MediaStreamTrackInterface() {}
 };
 
 // Interface for rendering VideoFrames from a VideoTrack
-class VideoRendererInterface {
+class VideoRendererInterface
+    : public rtc::VideoSinkInterface<cricket::VideoFrame> {
  public:
   // |frame| may have pending rotation. For clients which can't apply rotation,
   // |frame|->GetCopyWithRotationApplied() will return a frame that has the
   // rotation applied.
   virtual void RenderFrame(const cricket::VideoFrame* frame) = 0;
+  // Intended to replace RenderFrame.
+  void OnFrame(const cricket::VideoFrame& frame) override {
+    RenderFrame(&frame);
+  }
 
  protected:
   // The destructor is protected to prevent deletion via the interface.
   // This is so that we allow reference counted classes, where the destructor
   // should never be public, to implement the interface.
   virtual ~VideoRendererInterface() {}
 };
 
 class VideoSourceInterface;
 
 class VideoTrackInterface : public MediaStreamTrackInterface {
  public:
-  // Register a renderer that will render all frames received on this track.
-  virtual void AddRenderer(VideoRendererInterface* renderer) = 0;
-  // Deregister a renderer.
-  virtual void RemoveRenderer(VideoRendererInterface* renderer) = 0;
-
+  // Backwards compatibility wrappers
+  virtual void AddRenderer(VideoRendererInterface* renderer) {
+    AddSink(renderer);
+  }
+  virtual void RemoveRenderer(VideoRendererInterface* renderer) {
+    RemoveSink(renderer);
+  }
+  // Register a sink that will receive all frames received on this
+  // track. Tolerates sink == nullptr, and does nothing.

[perkj_webrtc, 2016/01/28 13:45:16]

I think we should try to be strict. Prefer to not tolerate nullptr.

[nisse-webrtc, 2016/01/29 07:48:29]

Added a RTC_DCHECK in AddSink, and hopefully made callers no pass nullptr.
RemoveSink still allows nullptr.

+  virtual void AddSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) = 0;
+  // Deregister a sink. Tolerates sink == nullptr.
+  virtual void RemoveSink(
+      rtc::VideoSinkInterface<cricket::VideoFrame>* sink) = 0;
   virtual VideoSourceInterface* GetSource() const = 0;
 
  protected:
   virtual ~VideoTrackInterface() {}
 };
 
 // Interface for receiving audio data from a AudioTrack.
 class AudioTrackSinkInterface {
  public:
   virtual void OnData(const void* audio_data,
@@ skipping 115 matching lines @@
   virtual bool RemoveTrack(AudioTrackInterface* track) = 0;
   virtual bool RemoveTrack(VideoTrackInterface* track) = 0;
 
  protected:
   virtual ~MediaStreamInterface() {}
 };
 
 }  // namespace webrtc
 
 #endif  // TALK_APP_WEBRTC_MEDIASTREAMINTERFACE_H_