commit a3ede6c5107a6d232ee115114a4130bfd0adac0c
author perkj <perkj@webrtc.org> Tue Mar 08 00:27:48 2016
committer perkj <perkj@webrtc.org> Tue Mar 08 00:28:03 2016
tree a9eee7edda83bd471b6c73ab1b0fe8bebc2c7107
parent 5291393510c17748701706471272c1ba0151dec2

Renamed VideoSourceInterface to VideoTrackSourceInterface.

Moved VideoSourceInterface to MediaStreamInterface.h
Renamed VideoSourceTest to VideoCapturerTrackSourceTest
Renamed VideoSource to VideoCaptureTrackSource and cl lint and cl format.
BUG=webrtc:5426
TBR=pthatcher@webrtc.org

Review URL: https://codereview.webrtc.org/1770003002 .

Cr-Commit-Position: refs/heads/master@{#11893}

webrtc/api/mediastreaminterface.h

diff --git a/webrtc/api/mediastreaminterface.h b/webrtc/api/mediastreaminterface.h
index 100db08..c9ce4a5 100644
--- a/webrtc/api/mediastreaminterface.h
+++ b/webrtc/api/mediastreaminterface.h
@@ -23,6 +23,7 @@
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/media/base/videosourceinterface.h"
 
@@ -120,17 +121,34 @@
   virtual ~VideoRendererInterface() {}
 };
 
-class VideoSourceInterface;
+// VideoTrackSourceInterface is a reference counted source used for VideoTracks.
+// The same source can be used in multiple VideoTracks.
+class VideoTrackSourceInterface
+    : public MediaSourceInterface,
+      public rtc::VideoSourceInterface<cricket::VideoFrame> {
+ public:
+  // Get access to the source implementation of cricket::VideoCapturer.
+  // This can be used for receiving frames and state notifications.
+  // But it should not be used for starting or stopping capturing.
+  // TODO(perkj): We are currently trying to replace all internal use of
+  // cricket::VideoCapturer with rtc::VideoSourceInterface. Once that
+  // refactoring is done,
+  // remove this method.
+  virtual cricket::VideoCapturer* GetVideoCapturer() = 0;
+
+  virtual void Stop() = 0;
+  virtual void Restart() = 0;
+
+  virtual const cricket::VideoOptions* options() const = 0;
+
+ protected:
+  virtual ~VideoTrackSourceInterface() {}
+};
 
 class VideoTrackInterface
     : public MediaStreamTrackInterface,
       public rtc::VideoSourceInterface<cricket::VideoFrame> {
  public:
-  // Make an unqualified VideoSourceInterface resolve to
-  // webrtc::VideoSourceInterface, not our base class
-  // rtc::VideoSourceInterface<cricket::VideoFrame>.
-  using VideoSourceInterface = webrtc::VideoSourceInterface;
-
   // AddRenderer and RemoveRenderer are for backwards compatibility
   // only. They are obsoleted by the methods of
   // rtc::VideoSourceInterface.
@@ -147,7 +165,7 @@
   void RemoveSink(
       rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override{};
 
-  virtual VideoSourceInterface* GetSource() const = 0;
+  virtual VideoTrackSourceInterface* 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