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

Unified Diff: talk/app/webrtc/peerconnection.cc

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add missing updated_options Created 5 years, 2 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: talk/app/webrtc/peerconnection.cc
diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc
index e7b33c43acdbd917ad549aac93df2611fd818475..3c0dc83aa387c21994fb0962308e39c86c9599a5 100644
--- a/talk/app/webrtc/peerconnection.cc
+++ b/talk/app/webrtc/peerconnection.cc
@@ -630,12 +630,14 @@ bool PeerConnection::Initialize(
// No step delay is used while allocating ports.
port_allocator_->set_step_delay(cricket::kMinimumStepDelay);
+ media_controller_.reset(factory_->CreateMediaController());
+
remote_stream_factory_.reset(new RemoteMediaStreamFactory(
- factory_->signaling_thread(), factory_->channel_manager()));
+ factory_->signaling_thread(), media_controller_->channel_manager()));
- session_.reset(new WebRtcSession(
- factory_->channel_manager(), factory_->signaling_thread(),
- factory_->worker_thread(), port_allocator_.get()));
+ session_.reset(
+ new WebRtcSession(media_controller_.get(), factory_->signaling_thread(),
+ factory_->worker_thread(), port_allocator_.get()));
stats_.reset(new StatsCollector(this));
// Initialize the WebRtcSession. It creates transport channels etc.

Powered by Google App Engine
This is Rietveld 408576698