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

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

Issue 1670153003: Introduce struct MediaConfig, with construction-time settings. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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
Index: talk/app/webrtc/mediacontroller.cc
diff --git a/talk/app/webrtc/mediacontroller.cc b/talk/app/webrtc/mediacontroller.cc
index 24f5877483b0752c9e8e5e85566981701a948232..16b32ae9a34053e398ef9abe39e5be3e38e95bbd 100644
--- a/talk/app/webrtc/mediacontroller.cc
+++ b/talk/app/webrtc/mediacontroller.cc
@@ -42,8 +42,11 @@ class MediaController : public webrtc::MediaControllerInterface,
public sigslot::has_slots<> {
public:
MediaController(rtc::Thread* worker_thread,
+ const webrtc::MediaConfig& config,
cricket::ChannelManager* channel_manager)
- : worker_thread_(worker_thread), channel_manager_(channel_manager) {
+ : worker_thread_(worker_thread),
+ config_(config),
+ channel_manager_(channel_manager) {
RTC_DCHECK(nullptr != worker_thread);
worker_thread_->Invoke<void>(
rtc::Bind(&MediaController::Construct_w, this,
@@ -61,6 +64,9 @@ class MediaController : public webrtc::MediaControllerInterface,
cricket::ChannelManager* channel_manager() const override {
return channel_manager_;
}
+ const webrtc::MediaConfig* config() const override {
+ return &config_;
+ }
private:
void Construct_w(cricket::MediaEngineInterface* media_engine) {
@@ -79,6 +85,7 @@ class MediaController : public webrtc::MediaControllerInterface,
}
rtc::Thread* const worker_thread_;
+ const webrtc::MediaConfig config_;
cricket::ChannelManager* const channel_manager_;
rtc::scoped_ptr<webrtc::Call> call_;
@@ -90,7 +97,8 @@ namespace webrtc {
MediaControllerInterface* MediaControllerInterface::Create(
rtc::Thread* worker_thread,
+ const MediaConfig& config,
cricket::ChannelManager* channel_manager) {
- return new MediaController(worker_thread, channel_manager);
+ return new MediaController(worker_thread, config, channel_manager);
}
} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698