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

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

Issue 120893002: Eliminate video capture thread in renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: upload again Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_stream_dependency_factory.h" 5 #include "content/renderer/media/media_stream_dependency_factory.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "base/synchronization/waitable_event.h" 11 #include "base/synchronization/waitable_event.h"
12 #include "content/common/media/media_stream_messages.h" 12 #include "content/common/media/media_stream_messages.h"
13 #include "content/public/common/content_switches.h" 13 #include "content/public/common/content_switches.h"
14 #include "content/renderer/media/media_stream_source_extra_data.h" 14 #include "content/renderer/media/media_stream_source_extra_data.h"
15 #include "content/renderer/media/media_stream_track_extra_data.h" 15 #include "content/renderer/media/media_stream_track_extra_data.h"
16 #include "content/renderer/media/media_stream_video_track.h" 16 #include "content/renderer/media/media_stream_video_track.h"
17 #include "content/renderer/media/peer_connection_identity_service.h" 17 #include "content/renderer/media/peer_connection_identity_service.h"
18 #include "content/renderer/media/rtc_media_constraints.h" 18 #include "content/renderer/media/rtc_media_constraints.h"
19 #include "content/renderer/media/rtc_peer_connection_handler.h" 19 #include "content/renderer/media/rtc_peer_connection_handler.h"
20 #include "content/renderer/media/rtc_video_capturer.h" 20 #include "content/renderer/media/rtc_video_capturer.h"
21 #include "content/renderer/media/rtc_video_decoder_factory.h" 21 #include "content/renderer/media/rtc_video_decoder_factory.h"
22 #include "content/renderer/media/rtc_video_encoder_factory.h" 22 #include "content/renderer/media/rtc_video_encoder_factory.h"
23 #include "content/renderer/media/video_capture_impl_manager.h"
24 #include "content/renderer/media/webaudio_capturer_source.h" 23 #include "content/renderer/media/webaudio_capturer_source.h"
25 #include "content/renderer/media/webrtc_audio_device_impl.h" 24 #include "content/renderer/media/webrtc_audio_device_impl.h"
26 #include "content/renderer/media/webrtc_local_audio_track.h" 25 #include "content/renderer/media/webrtc_local_audio_track.h"
27 #include "content/renderer/media/webrtc_uma_histograms.h" 26 #include "content/renderer/media/webrtc_uma_histograms.h"
28 #include "content/renderer/p2p/ipc_network_manager.h" 27 #include "content/renderer/p2p/ipc_network_manager.h"
29 #include "content/renderer/p2p/ipc_socket_factory.h" 28 #include "content/renderer/p2p/ipc_socket_factory.h"
30 #include "content/renderer/p2p/port_allocator.h" 29 #include "content/renderer/p2p/port_allocator.h"
31 #include "content/renderer/render_thread_impl.h" 30 #include "content/renderer/render_thread_impl.h"
32 #include "jingle/glue/thread_wrapper.h" 31 #include "jingle/glue/thread_wrapper.h"
33 #include "media/filters/gpu_video_accelerator_factories.h" 32 #include "media/filters/gpu_video_accelerator_factories.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 233
235 blink::WebMediaStream* web_stream_; 234 blink::WebMediaStream* web_stream_;
236 MediaStreamDependencyFactory::MediaSourcesCreatedCallback ready_callback_; 235 MediaStreamDependencyFactory::MediaSourcesCreatedCallback ready_callback_;
237 bool live_; 236 bool live_;
238 typedef std::vector<scoped_refptr<webrtc::MediaSourceInterface> > 237 typedef std::vector<scoped_refptr<webrtc::MediaSourceInterface> >
239 ObservedSources; 238 ObservedSources;
240 ObservedSources sources_; 239 ObservedSources sources_;
241 }; 240 };
242 241
243 MediaStreamDependencyFactory::MediaStreamDependencyFactory( 242 MediaStreamDependencyFactory::MediaStreamDependencyFactory(
244 VideoCaptureImplManager* vc_manager,
245 P2PSocketDispatcher* p2p_socket_dispatcher) 243 P2PSocketDispatcher* p2p_socket_dispatcher)
246 : network_manager_(NULL), 244 : network_manager_(NULL),
247 #if defined(GOOGLE_TV) 245 #if defined(GOOGLE_TV)
248 decoder_factory_tv_(NULL), 246 decoder_factory_tv_(NULL),
249 #endif 247 #endif
250 vc_manager_(vc_manager),
251 p2p_socket_dispatcher_(p2p_socket_dispatcher), 248 p2p_socket_dispatcher_(p2p_socket_dispatcher),
252 signaling_thread_(NULL), 249 signaling_thread_(NULL),
253 worker_thread_(NULL), 250 worker_thread_(NULL),
254 chrome_worker_thread_("Chrome_libJingle_WorkerThread"), 251 chrome_worker_thread_("Chrome_libJingle_WorkerThread"),
255 aec_dump_file_(base::kInvalidPlatformFileValue) { 252 aec_dump_file_(base::kInvalidPlatformFileValue) {
256 } 253 }
257 254
258 MediaStreamDependencyFactory::~MediaStreamDependencyFactory() { 255 MediaStreamDependencyFactory::~MediaStreamDependencyFactory() {
259 CleanupPeerConnectionFactory(); 256 CleanupPeerConnectionFactory();
260 if (aec_dump_file_ != base::kInvalidPlatformFileValue) 257 if (aec_dump_file_ != base::kInvalidPlatformFileValue)
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 pc_factory_->CreateAudioSource(constraints).get(); 720 pc_factory_->CreateAudioSource(constraints).get();
724 return source; 721 return source;
725 } 722 }
726 723
727 scoped_refptr<webrtc::VideoSourceInterface> 724 scoped_refptr<webrtc::VideoSourceInterface>
728 MediaStreamDependencyFactory::CreateLocalVideoSource( 725 MediaStreamDependencyFactory::CreateLocalVideoSource(
729 int video_session_id, 726 int video_session_id,
730 bool is_screencast, 727 bool is_screencast,
731 const webrtc::MediaConstraintsInterface* constraints) { 728 const webrtc::MediaConstraintsInterface* constraints) {
732 RtcVideoCapturer* capturer = new RtcVideoCapturer( 729 RtcVideoCapturer* capturer = new RtcVideoCapturer(
733 video_session_id, vc_manager_.get(), is_screencast); 730 video_session_id, is_screencast);
734 731
735 // The video source takes ownership of |capturer|. 732 // The video source takes ownership of |capturer|.
736 scoped_refptr<webrtc::VideoSourceInterface> source = 733 scoped_refptr<webrtc::VideoSourceInterface> source =
737 pc_factory_->CreateVideoSource(capturer, constraints).get(); 734 pc_factory_->CreateVideoSource(capturer, constraints).get();
738 return source; 735 return source;
739 } 736 }
740 737
741 scoped_refptr<WebAudioCapturerSource> 738 scoped_refptr<WebAudioCapturerSource>
742 MediaStreamDependencyFactory::CreateWebAudioSource( 739 MediaStreamDependencyFactory::CreateWebAudioSource(
743 blink::WebMediaStreamSource* source, 740 blink::WebMediaStreamSource* source,
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1043 if (!aec_dump_file_stream) { 1040 if (!aec_dump_file_stream) {
1044 VLOG(1) << "Could not open AEC dump file."; 1041 VLOG(1) << "Could not open AEC dump file.";
1045 base::ClosePlatformFile(aec_dump_file); 1042 base::ClosePlatformFile(aec_dump_file);
1046 } else { 1043 } else {
1047 // |pc_factory_| takes ownership of |aec_dump_file_stream|. 1044 // |pc_factory_| takes ownership of |aec_dump_file_stream|.
1048 pc_factory_->StartAecDump(aec_dump_file_stream); 1045 pc_factory_->StartAecDump(aec_dump_file_stream);
1049 } 1046 }
1050 } 1047 }
1051 1048
1052 } // namespace content 1049 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698