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

Unified 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, 2 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: content/renderer/media/media_stream_dependency_factory.cc
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..faee8de0460112fef69ed8ad5271faa561a88057
--- /dev/null
+++ b/content/renderer/media/media_stream_dependency_factory.cc
@@ -0,0 +1,48 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/renderer/media/media_stream_dependency_factory.h"
+
+#include "content/renderer/media/video_capture_module_impl.h"
+#include "content/renderer/media/webrtc_audio_device_impl.h"
+#include "content/renderer/p2p/ipc_network_manager.h"
+#include "content/renderer/p2p/ipc_socket_factory.h"
+#include "jingle/glue/thread_wrapper.h"
+#include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h"
+#include "third_party/libjingle/source/talk/p2p/client/httpportallocator.h"
+#include "third_party/libjingle/source/talk/session/phone/dummydevicemanager.h"
+#include "third_party/libjingle/source/talk/session/phone/webrtcmediaengine.h"
+
+cricket::WebRtcMediaEngine*
+MediaStreamDependencyFactory::CreateWebRtcMediaEngine() {
+ webrtc::AudioDeviceModule* adm = new WebRtcAudioDeviceImpl();
+ webrtc::AudioDeviceModule* adm_sc = new WebRtcAudioDeviceImpl();
+ return new cricket::WebRtcMediaEngine(adm, adm_sc, NULL);
+}
+
+bool MediaStreamDependencyFactory::CreatePeerConnectionFactory(
+ 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.
+ cricket::MediaEngineInterface* media_engine,
+ talk_base::Thread* worker_thread) {
+ pc_factory_.reset(new webrtc::PeerConnectionFactory(
+ port_allocator,
+ media_engine,
+ new cricket::DummyDeviceManager(),
+ worker_thread));
+ return pc_factory_->Initialize();
+}
+
+void MediaStreamDependencyFactory::DeletePeerConnectionFactory() {
+ pc_factory_.reset();
+}
+
+bool MediaStreamDependencyFactory::PeerConnectionFactoryCreated() {
+ return pc_factory_.get() != NULL;
+}
+
+webrtc::PeerConnection* MediaStreamDependencyFactory::CreatePeerConnection(
+ talk_base::Thread* signaling_thread) {
+ 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.
+ return pc_factory_->CreatePeerConnection(signaling_thread);
+}

Powered by Google App Engine
This is Rietveld 408576698