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

Side by Side Diff: content/renderer/media/media_stream_dependency_factory.cc

Issue 8060055: Adding support for MediaStream and PeerConnection functionality (Closed) Base URL: http://git.chromium.org/chromium/chromium.git@trunk
Patch Set: Adding render view files again, can't split CL Created 9 years, 1 month 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 unified diff | Download patch
OLDNEW
(Empty)
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "content/renderer/media/media_stream_dependency_factory.h"
6
7 #include "content/renderer/media/video_capture_module_impl.h"
8 #include "content/renderer/media/webrtc_audio_device_impl.h"
9 #include "content/renderer/p2p/ipc_network_manager.h"
10 #include "content/renderer/p2p/ipc_socket_factory.h"
11 #include "jingle/glue/thread_wrapper.h"
12 #include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h"
13 #include "third_party/libjingle/source/talk/p2p/client/httpportallocator.h"
14 #include "third_party/libjingle/source/talk/session/phone/dummydevicemanager.h"
15 #include "third_party/libjingle/source/talk/session/phone/webrtcmediaengine.h"
16
17 cricket::WebRtcMediaEngine*
18 MediaStreamDependencyFactory::CreateWebRtcMediaEngine() {
19 webrtc::AudioDeviceModule* adm = new WebRtcAudioDeviceImpl();
20 webrtc::AudioDeviceModule* adm_sc = new WebRtcAudioDeviceImpl();
21 return new cricket::WebRtcMediaEngine(adm, adm_sc, NULL);
22 }
23
24 bool MediaStreamDependencyFactory::CreatePeerConnectionFactory(
25 cricket::PortAllocator* port_allocator,
scherkus (not reviewing) 2011/10/31 01:59:13 these should args be indented by 4 spaces
Henrik Grunell 2011/10/31 13:17:53 Done.
26 cricket::MediaEngineInterface* media_engine,
27 talk_base::Thread* worker_thread) {
28 pc_factory_.reset(new webrtc::PeerConnectionFactory(
29 port_allocator,
30 media_engine,
31 new cricket::DummyDeviceManager(),
32 worker_thread));
33 return pc_factory_->Initialize();
34 }
35
36 void MediaStreamDependencyFactory::DeletePeerConnectionFactory() {
37 pc_factory_.reset();
38 }
39
40 bool MediaStreamDependencyFactory::PeerConnectionFactoryCreated() {
41 return pc_factory_.get() != NULL;
42 }
43
44 webrtc::PeerConnection* MediaStreamDependencyFactory::CreatePeerConnection(
45 talk_base::Thread* signaling_thread) {
46 DCHECK(pc_factory_.get());
scherkus (not reviewing) 2011/10/31 01:59:13 nit: these types of DCHECKs() where we check-then-
Henrik Grunell 2011/10/31 13:17:53 Removed.
47 return pc_factory_->CreatePeerConnection(signaling_thread);
48 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698