Make VideoTrack and VideoTrackRenderers implement rtc::VideoSourceInterface.

webrtc/api/mediastreaminterface.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.
  */
 
 // This file contains interfaces for MediaStream, MediaTrack and MediaSource.
 // These interfaces are used for implementing MediaStream and MediaTrack as
 // defined in http://dev.w3.org/2011/webrtc/editor/webrtc.html#stream-api. These
 // interfaces must be used only with PeerConnection. PeerConnectionManager
 // interface provides the factory methods to create MediaStream and MediaTracks.
 
 #ifndef WEBRTC_API_MEDIASTREAMINTERFACE_H_
 #define WEBRTC_API_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"
+#include "webrtc/media/base/videosourceinterface.h"
 
 namespace cricket {
 
 class AudioRenderer;
 class VideoCapturer;
 class VideoRenderer;
 class VideoFrame;
 
 }  // namespace cricket
 
@@ skipping 77 matching lines @@
 
  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 {
+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
   // returned sink must not change between calls. Currently, this
   // method is used for remote tracks (VideoRtpReceiver); further
   // refactoring is planned for this path, it's unclear if this method
   // belongs here long term.
 
   // We do this instead of simply implementing the
   // VideoSourceInterface directly, because if we did the latter, we'd
@@ skipping 128 matching lines @@
   virtual bool RemoveTrack(AudioTrackInterface* track) = 0;
   virtual bool RemoveTrack(VideoTrackInterface* track) = 0;
 
  protected:
   virtual ~MediaStreamInterface() {}
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_MEDIASTREAMINTERFACE_H_