Make VideoTrack and VideoTrackRenderers implement rtc::VideoSourceInterface.

webrtc/api/mediastreaminterface.h

Index: webrtc/api/mediastreaminterface.h
diff --git a/webrtc/api/mediastreaminterface.h b/webrtc/api/mediastreaminterface.h
index d4fe2bf0eb228f0a3323d9f2742faf2ea2fd388b..cf3b2c527bc67285469b6dc2a02249260f12ab6a 100644
--- a/webrtc/api/mediastreaminterface.h
+++ b/webrtc/api/mediastreaminterface.h
@@ -24,6 +24,7 @@
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/media/base/videosinkinterface.h"
+#include "webrtc/media/base/videosourceinterface.h"
 
 namespace cricket {
 
@@ -121,14 +122,21 @@ class VideoRendererInterface
 
 class VideoSourceInterface;
 
-class VideoTrackInterface : public MediaStreamTrackInterface {
+class VideoTrackInterface
+    : public MediaStreamTrackInterface,
+      public rtc::VideoSourceInterface<cricket::VideoFrame> {
  public:
+  // Backwards compatibility functions
   // Register a renderer that will render all frames received on this track.
-  virtual void AddRenderer(VideoRendererInterface* renderer) = 0;
+  virtual void AddRenderer(VideoRendererInterface* renderer) {

[perkj_webrtc, 2016/02/11 15:30:43]

Comment that these are deprecated and the new methods should be used please

[nisse-webrtc, 2016/02/12 08:36:03]

Done.

+    AddOrUpdateSink(renderer, rtc::VideoSinkWants());
+  }
   // Deregister a renderer.
-  virtual void RemoveRenderer(VideoRendererInterface* renderer) = 0;
+  virtual void RemoveRenderer(VideoRendererInterface* renderer) {
+    RemoveSink(renderer);
+  }
 
-  virtual VideoSourceInterface* GetSource() const = 0;
+  virtual webrtc::VideoSourceInterface* GetSource() const = 0;
 
   // Return the track input sink. I.e., frames sent to this sink are
   // propagated to all renderers registered with the track. The