Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1064)

Unified Diff: webrtc/api/peerconnectionfactory.cc

Issue 1766653002: Replace SetCapturer and SetCaptureDevice by SetSource. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Move objc instance variables to the implementation file. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/api/peerconnectionfactory.cc
diff --git a/webrtc/api/peerconnectionfactory.cc b/webrtc/api/peerconnectionfactory.cc
index 852b7a8cce80d3ecb643548b157e93b6082b7790..2473b8d653abf44f118e01a18f79ab29e77750f4 100644
--- a/webrtc/api/peerconnectionfactory.cc
+++ b/webrtc/api/peerconnectionfactory.cc
@@ -71,6 +71,7 @@ CreatePeerConnectionFactory() {
return nullptr;
}
return PeerConnectionFactoryProxy::Create(pc_factory->signaling_thread(),
+ nullptr,
pc_factory);
}
@@ -98,7 +99,8 @@ CreatePeerConnectionFactory(
if (!result) {
return nullptr;
}
- return PeerConnectionFactoryProxy::Create(signaling_thread, pc_factory);
+ return PeerConnectionFactoryProxy::Create(signaling_thread, nullptr,
+ pc_factory);
}
PeerConnectionFactory::PeerConnectionFactory()
@@ -211,7 +213,8 @@ PeerConnectionFactory::CreateVideoSource(
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>
@@ -219,7 +222,8 @@ 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,
@@ -305,13 +309,13 @@ PeerConnectionFactory::CreatePeerConnection(
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));
}
@@ -321,7 +325,7 @@ rtc::scoped_refptr<VideoTrackInterface> PeerConnectionFactory::CreateVideoTrack(
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>
@@ -329,7 +333,7 @@ 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(

Powered by Google App Engine
This is Rietveld 408576698