talk/app/webrtc/peerconnectionfactory.cc - Issue 1670153003: Introduce struct MediaConfig, with construction-time settings.

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/peerconnectionfactory.cc

Issue 1670153003: Introduce struct MediaConfig, with construction-time settings. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Addressed Per's comments. 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

« talk/app/webrtc/fakemediacontroller.h ('K') | « talk/app/webrtc/peerconnectionfactory.h ('k') | talk/app/webrtc/peerconnectioninterface_unittest.cc » ('j') | talk/app/webrtc/peerconnectioninterface_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: talk/app/webrtc/peerconnectionfactory.cc

diff --git a/talk/app/webrtc/peerconnectionfactory.cc b/talk/app/webrtc/peerconnectionfactory.cc

index a781eb3e2594240b67aa6e61a01e11fa9b6718e8..67d1bcfa1e98dc9225c1ca08ffeac93e6d4f33fd 100644

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

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

@@ -303,10 +303,11 @@ PeerConnectionFactory::CreateAudioTrack(const std::string& id,

return AudioTrackProxy::Create(signaling_thread_, track);

}

-webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController()

+webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController(

+ const cricket::MediaConfig& config)

const {

RTC_DCHECK(signaling_thread_->IsCurrent());

- return MediaControllerInterface::Create(worker_thread_,

+ return MediaControllerInterface::Create(config, worker_thread_,

channel_manager_.get());

}