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

Unified Diff: talk/session/media/channelmanager.cc

Issue 1670153003: Introduce struct MediaConfig, with construction-time settings. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: git cl format 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/fakemediacontroller.h » ('j') | webrtc/api/peerconnectioninterface_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/session/media/channelmanager.cc
diff --git a/talk/session/media/channelmanager.cc b/talk/session/media/channelmanager.cc
index 9cac1451a297611a88468393a89976f907a80061..23a9651643073ad40154f53ba539fc8c99c04c87 100644
--- a/talk/session/media/channelmanager.cc
+++ b/talk/session/media/channelmanager.cc
@@ -266,8 +266,8 @@ VoiceChannel* ChannelManager::CreateVoiceChannel_w(
ASSERT(initialized_);
ASSERT(worker_thread_ == rtc::Thread::Current());
ASSERT(nullptr != media_controller);
- VoiceMediaChannel* media_channel =
- media_engine_->CreateChannel(media_controller->call_w(), options);
+ VoiceMediaChannel* media_channel = media_engine_->CreateChannel(
+ media_controller->call_w(), media_controller->config(), options);
if (!media_channel)
return nullptr;
@@ -324,8 +324,8 @@ VideoChannel* ChannelManager::CreateVideoChannel_w(
ASSERT(initialized_);
ASSERT(worker_thread_ == rtc::Thread::Current());
ASSERT(nullptr != media_controller);
- VideoMediaChannel* media_channel =
- media_engine_->CreateVideoChannel(media_controller->call_w(), options);
+ VideoMediaChannel* media_channel = media_engine_->CreateVideoChannel(
+ media_controller->call_w(), media_controller->config(), options);
if (media_channel == NULL) {
return NULL;
}
« no previous file with comments | « no previous file | webrtc/api/fakemediacontroller.h » ('j') | webrtc/api/peerconnectioninterface_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698