diff options
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_renderer.gypi | 7 | ||||
| -rw-r--r-- | content/renderer/media/media_stream_dependency_factory_stub.cc | 51 | ||||
| -rw-r--r-- | content/renderer/media/media_stream_impl_stub.cc | 90 | ||||
| -rw-r--r-- | content/renderer/render_view_impl.cc | 6 |
4 files changed, 7 insertions, 147 deletions
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index e5ed0d5..6ccbc9b 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -101,7 +101,6 @@ 'renderer/media/capture_video_decoder.cc', 'renderer/media/capture_video_decoder.h', 'renderer/media/media_stream_dependency_factory.h', - 'renderer/media/media_stream_dispatcher.cc', 'renderer/media/media_stream_dispatcher.h', 'renderer/media/media_stream_dispatcher_eventhandler.h', 'renderer/media/media_stream_impl.h', @@ -264,6 +263,7 @@ ], 'sources': [ 'renderer/media/media_stream_dependency_factory.cc', + 'renderer/media/media_stream_dispatcher.cc', 'renderer/media/media_stream_impl.cc', 'renderer/media/peer_connection_handler.cc', 'renderer/media/peer_connection_handler.h', @@ -272,11 +272,6 @@ 'renderer/media/webrtc_audio_device_impl.cc', 'renderer/media/webrtc_audio_device_impl.h', ], - }, { - 'sources': [ - 'renderer/media/media_stream_dependency_factory_stub.cc', - 'renderer/media/media_stream_impl_stub.cc', - ], }], ['java_bridge==1', { 'defines': [ diff --git a/content/renderer/media/media_stream_dependency_factory_stub.cc b/content/renderer/media/media_stream_dependency_factory_stub.cc deleted file mode 100644 index 82adb97..0000000 --- a/content/renderer/media/media_stream_dependency_factory_stub.cc +++ /dev/null @@ -1,51 +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" - -MediaStreamDependencyFactory::MediaStreamDependencyFactory() {} - -MediaStreamDependencyFactory::~MediaStreamDependencyFactory() {} - -bool MediaStreamDependencyFactory::CreatePeerConnectionFactory( - talk_base::Thread* worker_thread, - talk_base::Thread* signaling_thread, - content::P2PSocketDispatcher* socket_dispatcher, - talk_base::NetworkManager* network_manager, - talk_base::PacketSocketFactory* socket_factory) { - return false; -} - -void MediaStreamDependencyFactory::ReleasePeerConnectionFactory() { -} - -bool MediaStreamDependencyFactory::PeerConnectionFactoryCreated() { - return false; -} - -talk_base::scoped_refptr<webrtc::PeerConnectionInterface> -MediaStreamDependencyFactory::CreatePeerConnection( - const std::string& config, - webrtc::PeerConnectionObserver* observer) { - return NULL; -} - -talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> -MediaStreamDependencyFactory::CreateLocalMediaStream(const std::string& label) { - return NULL; -} - -talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface> -MediaStreamDependencyFactory::CreateLocalVideoTrack( - const std::string& label, - cricket::VideoCapturer* video_device) { - return NULL; -} - -talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface> -MediaStreamDependencyFactory::CreateLocalAudioTrack( - const std::string& label, - webrtc::AudioDeviceModule* audio_device) { - return NULL; -} diff --git a/content/renderer/media/media_stream_impl_stub.cc b/content/renderer/media/media_stream_impl_stub.cc deleted file mode 100644 index ade3fee..0000000 --- a/content/renderer/media/media_stream_impl_stub.cc +++ /dev/null @@ -1,90 +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_impl.h" - -#include "content/renderer/media/media_stream_dependency_factory.h" -#include "content/renderer/media/rtc_video_decoder.h" -#include "content/renderer/media/video_capture_impl_manager.h" -#include "content/renderer/p2p/ipc_socket_factory.h" - -MediaStreamImpl::MediaStreamImpl( - MediaStreamDispatcher* media_stream_dispatcher, - content::P2PSocketDispatcher* p2p_socket_dispatcher, - VideoCaptureImplManager* vc_manager, - MediaStreamDependencyFactory* dependency_factory) - : dependency_factory_(dependency_factory), - media_stream_dispatcher_(media_stream_dispatcher), - p2p_socket_dispatcher_(p2p_socket_dispatcher), - network_manager_(NULL), - vc_manager_(vc_manager), - peer_connection_handler_(NULL), - message_loop_proxy_(base::MessageLoopProxy::current()), - signaling_thread_(NULL), - worker_thread_(NULL), - chrome_worker_thread_("Chrome_libJingle_WorkerThread") { -} - -MediaStreamImpl::~MediaStreamImpl() {} - -WebKit::WebPeerConnectionHandler* MediaStreamImpl::CreatePeerConnectionHandler( - WebKit::WebPeerConnectionHandlerClient* client) { - return NULL; -} - -void MediaStreamImpl::ClosePeerConnection() { -} - -webrtc::MediaStreamTrackInterface* MediaStreamImpl::GetLocalMediaStreamTrack( - const std::string& label) { - return NULL; -} - -void MediaStreamImpl::requestUserMedia( - const WebKit::WebUserMediaRequest& user_media_request, - const WebKit::WebVector<WebKit::WebMediaStreamSource>& - media_stream_source_vector) { -} - -void MediaStreamImpl::cancelUserMediaRequest( - const WebKit::WebUserMediaRequest& user_media_request) { -} - -scoped_refptr<media::VideoDecoder> MediaStreamImpl::GetVideoDecoder( - const GURL& url, - media::MessageLoopFactory* message_loop_factory) { - return NULL; -} - -void MediaStreamImpl::OnStreamGenerated( - int request_id, - const std::string& label, - const media_stream::StreamDeviceInfoArray& audio_array, - const media_stream::StreamDeviceInfoArray& video_array) { -} - -void MediaStreamImpl::OnStreamGenerationFailed(int request_id) {} - -void MediaStreamImpl::OnVideoDeviceFailed(const std::string& label, - int index) { -} - -void MediaStreamImpl::OnAudioDeviceFailed(const std::string& label, - int index) { -} - -void MediaStreamImpl::OnDevicesEnumerated( - int request_id, - const media_stream::StreamDeviceInfoArray& device_array) { -} - -void MediaStreamImpl::OnDevicesEnumerationFailed(int request_id) {} - -void MediaStreamImpl::OnDeviceOpened( - int request_id, - const std::string& label, - const media_stream::StreamDeviceInfo& video_device) { -} - -void MediaStreamImpl::OnDeviceOpenFailed(int request_id) {} diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 31f47e1..639ff84 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -504,8 +504,10 @@ RenderViewImpl::RenderViewImpl( p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this); #endif +#if defined(ENABLE_WEBRTC) if (!media_stream_dispatcher_) media_stream_dispatcher_ = new MediaStreamDispatcher(this); +#endif new MHTMLGenerator(this); #if defined(OS_MACOSX) @@ -622,6 +624,8 @@ WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler( if (!cmd_line->HasSwitch(switches::kEnableMediaStream)) return NULL; EnsureMediaStreamImpl(); + if (!media_stream_impl_.get()) + return NULL; return media_stream_impl_->CreatePeerConnectionHandler(client); } @@ -3146,6 +3150,7 @@ void RenderViewImpl::EnsureMediaStreamImpl() { p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this); #endif +#if defined(ENABLE_WEBRTC) if (!media_stream_dispatcher_) media_stream_dispatcher_ = new MediaStreamDispatcher(this); @@ -3157,6 +3162,7 @@ void RenderViewImpl::EnsureMediaStreamImpl() { RenderThreadImpl::current()->video_capture_impl_manager(), factory); } +#endif } void RenderViewImpl::didChangeContentsSize(WebFrame* frame, |