Replace SetCapturer and SetCaptureDevice by SetSource.

webrtc/api/peerconnectionfactory.cc

 /*
  *  Copyright 2004 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.
  */
 
@@ skipping 53 matching lines @@
   rtc::scoped_refptr<PeerConnectionFactory> pc_factory(
       new rtc::RefCountedObject<PeerConnectionFactory>());
 
   RTC_CHECK(rtc::Thread::Current() == pc_factory->signaling_thread());
   // The signaling thread is the current thread so we can
   // safely call Initialize directly.
   if (!pc_factory->Initialize()) {
     return nullptr;
   }
   return PeerConnectionFactoryProxy::Create(pc_factory->signaling_thread(),
+                                            nullptr,
                                             pc_factory);
 }
 
 rtc::scoped_refptr<PeerConnectionFactoryInterface>
 CreatePeerConnectionFactory(
     rtc::Thread* worker_thread,
     rtc::Thread* signaling_thread,
     AudioDeviceModule* default_adm,
     cricket::WebRtcVideoEncoderFactory* encoder_factory,
     cricket::WebRtcVideoDecoderFactory* decoder_factory) {
   rtc::scoped_refptr<PeerConnectionFactory> pc_factory(
       new rtc::RefCountedObject<PeerConnectionFactory>(worker_thread,
                                                        signaling_thread,
                                                        default_adm,
                                                        encoder_factory,
                                                        decoder_factory));
 
   // Call Initialize synchronously but make sure its executed on
   // |signaling_thread|.
   MethodCall0<PeerConnectionFactory, bool> call(
       pc_factory.get(),
       &PeerConnectionFactory::Initialize);
   bool result =  call.Marshal(signaling_thread);
 
   if (!result) {
     return nullptr;
   }
-  return PeerConnectionFactoryProxy::Create(signaling_thread, pc_factory);
+  return PeerConnectionFactoryProxy::Create(signaling_thread, nullptr,
+                                            pc_factory);
 }
 
 PeerConnectionFactory::PeerConnectionFactory()
     : owns_ptrs_(true),
       wraps_current_thread_(false),
       signaling_thread_(rtc::ThreadManager::Instance()->CurrentThread()),
       worker_thread_(new rtc::Thread) {
   if (!signaling_thread_) {
     signaling_thread_ = rtc::ThreadManager::Instance()->WrapCurrentThread();
     wraps_current_thread_ = true;
@@ skipping 92 matching lines @@
 }
 
 rtc::scoped_refptr<VideoTrackSourceInterface>
 PeerConnectionFactory::CreateVideoSource(
     cricket::VideoCapturer* capturer,
     const MediaConstraintsInterface* constraints) {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   rtc::scoped_refptr<VideoTrackSourceInterface> source(
       VideoCapturerTrackSource::Create(worker_thread_, capturer, constraints,
                                        false));
-  return VideoTrackSourceProxy::Create(signaling_thread_, source);
+  return VideoTrackSourceProxy::Create(signaling_thread_, worker_thread_,
+                                       source);
 }
 
 rtc::scoped_refptr<VideoTrackSourceInterface>
 PeerConnectionFactory::CreateVideoSource(cricket::VideoCapturer* capturer) {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   rtc::scoped_refptr<VideoTrackSourceInterface> source(
       VideoCapturerTrackSource::Create(worker_thread_, capturer, false));
-  return VideoTrackSourceProxy::Create(signaling_thread_, source);
+  return VideoTrackSourceProxy::Create(signaling_thread_, worker_thread_,
+                                       source);
 }
 
 bool PeerConnectionFactory::StartAecDump(rtc::PlatformFile file,
                                          int64_t max_size_bytes) {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   return channel_manager_->StartAecDump(file, max_size_bytes);
 }
 
 void PeerConnectionFactory::StopAecDump() {
   RTC_DCHECK(signaling_thread_->IsCurrent());
@@ skipping 65 matching lines @@
   }
   if (configuration.suspend_below_min_bitrate) {
     media_config.video.suspend_below_min_bitrate =
         *(configuration.suspend_below_min_bitrate);
   }
 
   if (!pc->Initialize(media_config, configuration, std::move(allocator),
                       std::move(dtls_identity_store), observer)) {
     return nullptr;
   }
-  return PeerConnectionProxy::Create(signaling_thread(), pc);
+  return PeerConnectionProxy::Create(signaling_thread(), nullptr, pc);
 }
 
 rtc::scoped_refptr<MediaStreamInterface>
 PeerConnectionFactory::CreateLocalMediaStream(const std::string& label) {
   RTC_DCHECK(signaling_thread_->IsCurrent());
-  return MediaStreamProxy::Create(signaling_thread_,
+  return MediaStreamProxy::Create(signaling_thread_, nullptr,
                                   MediaStream::Create(label));
 }
 
 rtc::scoped_refptr<VideoTrackInterface> PeerConnectionFactory::CreateVideoTrack(
     const std::string& id,
     VideoTrackSourceInterface* source) {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   rtc::scoped_refptr<VideoTrackInterface> track(
       VideoTrack::Create(id, source));
-  return VideoTrackProxy::Create(signaling_thread_, track);
+  return VideoTrackProxy::Create(signaling_thread_, worker_thread_, track);
 }
 
 rtc::scoped_refptr<AudioTrackInterface>
 PeerConnectionFactory::CreateAudioTrack(const std::string& id,
                                         AudioSourceInterface* source) {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   rtc::scoped_refptr<AudioTrackInterface> track(AudioTrack::Create(id, source));
-  return AudioTrackProxy::Create(signaling_thread_, track);
+  return AudioTrackProxy::Create(signaling_thread_, nullptr, track);
 }
 
 webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController(
     const cricket::MediaConfig& config) const {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   return MediaControllerInterface::Create(config, worker_thread_,
                                           channel_manager_.get());
 }
 
 rtc::Thread* PeerConnectionFactory::signaling_thread() {
   // This method can be called on a different thread when the factory is
   // created in CreatePeerConnectionFactory().
   return signaling_thread_;
 }
 
 rtc::Thread* PeerConnectionFactory::worker_thread() {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   return worker_thread_;
 }
 
 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
   ASSERT(worker_thread_ == rtc::Thread::Current());
   return cricket::WebRtcMediaEngineFactory::Create(
       default_adm_.get(), video_encoder_factory_.get(),
       video_decoder_factory_.get());
 }
 
 }  // namespace webrtc