Make VideoTrack and VideoTrackRenderers implement rtc::VideoSourceInterface.

webrtc/api/videotrack.h

 /*
  *  Copyright 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_API_VIDEOTRACK_H_
 #define WEBRTC_API_VIDEOTRACK_H_
 
 #include <string>
 
 #include "webrtc/api/mediastreamtrack.h"
 #include "webrtc/api/videosourceinterface.h"
 #include "webrtc/api/videotrackrenderers.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 
 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;
   virtual bool set_enabled(bool enable);
   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
 
 #endif  // WEBRTC_API_VIDEOTRACK_H_