talk/app/webrtc/peerconnection.cc - Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Cleanup 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 86902b03591277b91d4a6106b38e7caf8e04d495..ca6af60dab57a39ab8d038bb6b86a6c5814d404b 100644

--- a/talk/app/webrtc/peerconnection.cc

+++ b/talk/app/webrtc/peerconnection.cc

@@ -420,13 +420,13 @@ bool PeerConnection::Initialize(

port_allocator_->set_step_delay(cricket::kMinimumStepDelay);

mediastream_signaling_.reset(new MediaStreamSignaling(

- factory_->signaling_thread(), this, factory_->channel_manager()));

+ factory_->signaling_thread(), this,

+ factory_->media_controller()->channel_manager()));

- session_.reset(new WebRtcSession(factory_->channel_manager(),

- factory_->signaling_thread(),

- factory_->worker_thread(),

- port_allocator_.get(),

- mediastream_signaling_.get()));

+ session_.reset(

+ new WebRtcSession(factory_->media_controller(),

+ factory_->signaling_thread(), factory_->worker_thread(),

+ port_allocator_.get(), mediastream_signaling_.get()));

stats_.reset(new StatsCollector(session_.get()));

// Initialize the WebRtcSession. It creates transport channels etc.

« no previous file with comments | « talk/app/webrtc/mediacontroller.cc ('k') | talk/app/webrtc/peerconnectionfactory.h » ('j') | talk/app/webrtc/peerconnectionfactory.h » ('J')