Make VideoTrack and VideoTrackRenderers implement rtc::VideoSourceInterface.

webrtc/api/videotrack.h

Index: webrtc/api/videotrack.h
diff --git a/webrtc/api/videotrack.h b/webrtc/api/videotrack.h
index f2b8f19c5bd2ec7678f5d5795809e72bc968c5d3..87dce3ab937835c6dcbfcf77b16413f2260ba0ee 100644
--- a/webrtc/api/videotrack.h
+++ b/webrtc/api/videotrack.h
@@ -23,11 +23,16 @@ namespace webrtc {
 class VideoTrack : public MediaStreamTrack<VideoTrackInterface> {
  public:
   static rtc::scoped_refptr<VideoTrack> Create(
-      const std::string& label, VideoSourceInterface* source);
+      // TODO(nisse): Why do we need the webrtc:: qualification on
+      // VideoSourceInterface???

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

I think you can use using=webrtc::VideoSourceInterface

ie 

class VideoTrack : public MediaStreamTrack<VideoTrackInterface> {
 public: 
   using=webrtc::VideoSourceInterface;
   .....

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

You mean

  using VideoSourceInterface = webrtc::VideoSourceInterface;

?

I'm adding it to VideoTrackInterface (which also uses
webrtc::VideoSourceInterface), with a TODO saying that I still don't understand
why it's needed.

+      const std::string& label,
+      webrtc::VideoSourceInterface* source);
 
-  virtual void AddRenderer(VideoRendererInterface* renderer);
-  virtual void RemoveRenderer(VideoRendererInterface* renderer);
-  virtual VideoSourceInterface* GetSource() const {
+  void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
+                       const rtc::VideoSinkWants& wants) override;
+  void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
+
+  virtual webrtc::VideoSourceInterface* GetSource() const {
     return video_source_.get();
   }
   rtc::VideoSinkInterface<cricket::VideoFrame>* GetSink() override;
@@ -35,12 +40,13 @@ class VideoTrack : public MediaStreamTrack<VideoTrackInterface> {
   virtual std::string kind() const;
 
  protected:
-  VideoTrack(const std::string& id, VideoSourceInterface* video_source);
+  VideoTrack(const std::string& id, webrtc::VideoSourceInterface* video_source);
   ~VideoTrack();
 
  private:
   VideoTrackRenderers renderers_;
-  rtc::scoped_refptr<VideoSourceInterface> video_source_;
+  // TODO(nisse): And here.

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

dito

+  rtc::scoped_refptr<webrtc::VideoSourceInterface> video_source_;
 };
 
 }  // namespace webrtc