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

Unified Diff: webrtc/api/peerconnection.cc

Issue 1759473003: Removed VideoSource dependency to ChannelManager. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix problem that Stop could be called mulptiple times. Created 4 years, 10 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
« no previous file with comments | « no previous file | webrtc/api/peerconnectionfactory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/peerconnection.cc
diff --git a/webrtc/api/peerconnection.cc b/webrtc/api/peerconnection.cc
index 125300a3b50955624256b407647047eedb579be1..1eca42a9e7c9e09780076e4a1247063613103ec7 100644
--- a/webrtc/api/peerconnection.cc
+++ b/webrtc/api/peerconnection.cc
@@ -382,9 +382,9 @@ namespace webrtc {
class RemoteMediaStreamFactory {
public:
explicit RemoteMediaStreamFactory(rtc::Thread* signaling_thread,
- cricket::ChannelManager* channel_manager)
+ rtc::Thread* worker_thread)
: signaling_thread_(signaling_thread),
- channel_manager_(channel_manager) {}
+ worker_thread_(worker_thread) {}
rtc::scoped_refptr<MediaStreamInterface> CreateMediaStream(
const std::string& stream_label) {
@@ -404,7 +404,7 @@ class RemoteMediaStreamFactory {
const std::string& track_id) {
return AddTrack<VideoTrackInterface, VideoTrack, VideoTrackProxy>(
stream, track_id,
- VideoSource::Create(channel_manager_, new RemoteVideoCapturer(),
+ VideoSource::Create(worker_thread_, new RemoteVideoCapturer(),
nullptr, true)
.get());
}
@@ -424,7 +424,7 @@ class RemoteMediaStreamFactory {
}
rtc::Thread* signaling_thread_;
- cricket::ChannelManager* channel_manager_;
+ rtc::Thread* worker_thread_;
};
bool ConvertRtcOptionsForOffer(
@@ -633,7 +633,7 @@ bool PeerConnection::Initialize(
media_controller_.reset(factory_->CreateMediaController(media_config));
remote_stream_factory_.reset(new RemoteMediaStreamFactory(
- factory_->signaling_thread(), media_controller_->channel_manager()));
+ factory_->signaling_thread(), factory_->worker_thread()));
session_.reset(
new WebRtcSession(media_controller_.get(), factory_->signaling_thread(),
« no previous file with comments | « no previous file | webrtc/api/peerconnectionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698