summaryrefslogtreecommitdiffstats
path: root/content/renderer/media/media_stream_dependency_factory.cc
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-11 09:17:34 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-11 09:17:34 +0000
commit54f3459735c6eab22f8a607a5ef84ff97d270871 (patch)
tree168f8a30436375e4e682d04622acf28173ce3101 /content/renderer/media/media_stream_dependency_factory.cc
parent3b179a3f81cdb93ec7a409e34bd6c4e854c90c86 (diff)
downloadchromium_src-54f3459735c6eab22f8a607a5ef84ff97d270871.zip
chromium_src-54f3459735c6eab22f8a607a5ef84ff97d270871.tar.gz
chromium_src-54f3459735c6eab22f8a607a5ef84ff97d270871.tar.bz2
Revert 117187 - Adding support for MediaStream and PeerConnection functionality.
BUG= TEST=content_unittests Review URL: http://codereview.chromium.org/8060055 TBR=grunell@chromium.org Review URL: http://codereview.chromium.org/9139010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117191 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/media_stream_dependency_factory.cc')
-rw-r--r--content/renderer/media/media_stream_dependency_factory.cc72
1 files changed, 0 insertions, 72 deletions
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc
deleted file mode 100644
index 4e78f4b..0000000
--- a/content/renderer/media/media_stream_dependency_factory.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) 2012 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 "content/renderer/p2p/port_allocator.h"
-#include "jingle/glue/thread_wrapper.h"
-#include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h"
-#include "third_party/libjingle/source/talk/session/phone/dummydevicemanager.h"
-#include "third_party/libjingle/source/talk/session/phone/webrtcmediaengine.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-
-MediaStreamDependencyFactory::MediaStreamDependencyFactory() {}
-
-MediaStreamDependencyFactory::~MediaStreamDependencyFactory() {}
-
-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::MediaEngineInterface* media_engine,
- talk_base::Thread* worker_thread) {
- if (!pc_factory_.get()) {
- scoped_ptr<webrtc::PeerConnectionFactory> factory(
- new webrtc::PeerConnectionFactory(media_engine,
- new cricket::DummyDeviceManager(),
- worker_thread));
- if (factory->Initialize())
- pc_factory_.reset(factory.release());
- }
- return pc_factory_.get() != NULL;
-}
-
-void MediaStreamDependencyFactory::DeletePeerConnectionFactory() {
- pc_factory_.reset();
-}
-
-bool MediaStreamDependencyFactory::PeerConnectionFactoryCreated() {
- return pc_factory_.get() != NULL;
-}
-
-cricket::PortAllocator* MediaStreamDependencyFactory::CreatePortAllocator(
- content::P2PSocketDispatcher* socket_dispatcher,
- talk_base::NetworkManager* network_manager,
- talk_base::PacketSocketFactory* socket_factory,
- const webkit_glue::P2PTransport::Config& config) {
- WebKit::WebFrame* web_frame = WebKit::WebFrame::frameForCurrentContext();
- if (!web_frame) {
- DVLOG(1) << "WebFrame is NULL.";
- return NULL;
- }
- return new content::P2PPortAllocator(web_frame,
- socket_dispatcher,
- network_manager,
- socket_factory,
- config);
-}
-
-webrtc::PeerConnection* MediaStreamDependencyFactory::CreatePeerConnection(
- cricket::PortAllocator* port_allocator,
- talk_base::Thread* signaling_thread) {
- return pc_factory_->CreatePeerConnection(port_allocator, signaling_thread);
-}