talk/app/webrtc/peerconnectionfactory.cc - Issue 1346153002: Remove use of DeviceManager from ChannelManager.

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 1346153002: Remove use of DeviceManager from ChannelManager. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: rebase Created 5 years, 3 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 | « talk/app/webrtc/mediastreamsignaling_unittest.cc ('k') | talk/app/webrtc/statscollector_unittest.cc » ('j') | talk/session/media/channelmanager.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 98c5c852d83857ad379d28193cd1af92212b17a9..c329446319dd9c02f8b0814ddcbe9cce9ff5cf8b 100644

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

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

@@ -38,7 +38,6 @@

#include "talk/app/webrtc/videosource.h"

#include "talk/app/webrtc/videosourceproxy.h"

#include "talk/app/webrtc/videotrack.h"

-#include "talk/media/devices/dummydevicemanager.h"

#include "talk/media/webrtc/webrtcmediaengine.h"

#include "talk/media/webrtc/webrtcvideodecoderfactory.h"

#include "talk/media/webrtc/webrtcvideoencoderfactory.h"

@@ -174,17 +173,14 @@ bool PeerConnectionFactory::Initialize() {

if (!default_allocator_factory_)

return false;

- cricket::DummyDeviceManager* device_manager(

- new cricket::DummyDeviceManager());

// TODO: Need to make sure only one VoE is created inside

// WebRtcMediaEngine.

cricket::MediaEngineInterface* media_engine =

worker_thread_->Invoke<cricket::MediaEngineInterface*>(rtc::Bind(

&PeerConnectionFactory::CreateMediaEngine_w, this));

- channel_manager_.reset(new cricket::ChannelManager(

- media_engine, device_manager, worker_thread_));

+ channel_manager_.reset(

+ new cricket::ChannelManager(media_engine, worker_thread_));

channel_manager_->SetVideoRtxEnabled(true);

if (!channel_manager_->Init()) {

« no previous file with comments | « talk/app/webrtc/mediastreamsignaling_unittest.cc ('k') | talk/app/webrtc/statscollector_unittest.cc » ('j') | talk/session/media/channelmanager.cc » ('J')