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/peerconnectionfactory.cc

diff --git a/webrtc/api/peerconnectionfactory.cc b/webrtc/api/peerconnectionfactory.cc
index 40e845f..22e450c 100644
--- a/webrtc/api/peerconnectionfactory.cc
+++ b/webrtc/api/peerconnectionfactory.cc
@@ -21,7 +21,7 @@
 #include "webrtc/api/peerconnection.h"
 #include "webrtc/api/peerconnectionfactoryproxy.h"
 #include "webrtc/api/peerconnectionproxy.h"
-#include "webrtc/api/videosource.h"
+#include "webrtc/api/videocapturertracksource.h"
 #include "webrtc/api/videosourceproxy.h"
 #include "webrtc/api/videotrack.h"
 #include "webrtc/base/bind.h"
@@ -208,22 +208,23 @@
   return source;
 }
 
-rtc::scoped_refptr<VideoSourceInterface>
+rtc::scoped_refptr<VideoTrackSourceInterface>
 PeerConnectionFactory::CreateVideoSource(
     cricket::VideoCapturer* capturer,
     const MediaConstraintsInterface* constraints) {
   RTC_DCHECK(signaling_thread_->IsCurrent());
-  rtc::scoped_refptr<VideoSource> source(VideoSource::Create(
-      worker_thread_, capturer, constraints, false));
-  return VideoSourceProxy::Create(signaling_thread_, source);
+  rtc::scoped_refptr<VideoTrackSourceInterface> source(
+      VideoCapturerTrackSource::Create(worker_thread_, capturer, constraints,
+                                       false));
+  return VideoTrackSourceProxy::Create(signaling_thread_, source);
 }
 
-rtc::scoped_refptr<VideoSourceInterface>
+rtc::scoped_refptr<VideoTrackSourceInterface>
 PeerConnectionFactory::CreateVideoSource(cricket::VideoCapturer* capturer) {
   RTC_DCHECK(signaling_thread_->IsCurrent());
-  rtc::scoped_refptr<VideoSource> source(
-      VideoSource::Create(worker_thread_, capturer, false));
-  return VideoSourceProxy::Create(signaling_thread_, source);
+  rtc::scoped_refptr<VideoTrackSourceInterface> source(
+      VideoCapturerTrackSource::Create(worker_thread_, capturer, false));
+  return VideoTrackSourceProxy::Create(signaling_thread_, source);
 }
 
 bool PeerConnectionFactory::StartAecDump(rtc::PlatformFile file,
@@ -319,10 +320,9 @@
                                   MediaStream::Create(label));
 }
 
-rtc::scoped_refptr<VideoTrackInterface>
-PeerConnectionFactory::CreateVideoTrack(
+rtc::scoped_refptr<VideoTrackInterface> PeerConnectionFactory::CreateVideoTrack(
     const std::string& id,
-    VideoSourceInterface* source) {
+    VideoTrackSourceInterface* source) {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   rtc::scoped_refptr<VideoTrackInterface> track(
       VideoTrack::Create(id, source));