webrtc/api/peerconnection.cc - Issue 1818033002: Embed a cricket::MediaConfig in RTCConfiguration.

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: webrtc/api/peerconnection.cc

Issue 1818033002: Embed a cricket::MediaConfig in RTCConfiguration. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Rebased. 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/peerconnection.cc

diff --git a/webrtc/api/peerconnection.cc b/webrtc/api/peerconnection.cc

index b2b8062ca843a00015851e2f9a735d53e13fee0f..70a386ec14f8905382893b266589b17afefc5456 100644

--- a/webrtc/api/peerconnection.cc

+++ b/webrtc/api/peerconnection.cc

@@ -525,7 +525,6 @@ PeerConnection::~PeerConnection() {

}

bool PeerConnection::Initialize(

- const cricket::MediaConfig& media_config,

const PeerConnectionInterface::RTCConfiguration& configuration,

rtc::scoped_ptr<cricket::PortAllocator> allocator,

rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,

@@ -569,7 +568,8 @@ bool PeerConnection::Initialize(

// No step delay is used while allocating ports.

port_allocator_->set_step_delay(cricket::kMinimumStepDelay);

- media_controller_.reset(factory_->CreateMediaController(media_config));

+ media_controller_.reset(

+ factory_->CreateMediaController(configuration.media_config));

session_.reset(

new WebRtcSession(media_controller_.get(), factory_->signaling_thread(),

« no previous file with comments | « webrtc/api/peerconnection.h ('k') | webrtc/api/peerconnectionfactory.cc » ('j') | no next file with comments »