OLD | NEW |
---|---|
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/synchronization/waitable_event.h" | 9 #include "base/synchronization/waitable_event.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
11 #include "content/renderer/media/media_stream_source_extra_data.h" | 11 #include "content/renderer/media/media_stream_source_extra_data.h" |
12 #include "content/renderer/media/rtc_media_constraints.h" | 12 #include "content/renderer/media/rtc_media_constraints.h" |
13 #include "content/renderer/media/rtc_peer_connection_handler.h" | 13 #include "content/renderer/media/rtc_peer_connection_handler.h" |
14 #include "content/renderer/media/rtc_video_capturer.h" | 14 #include "content/renderer/media/rtc_video_capturer.h" |
15 #include "content/renderer/media/rtc_video_decoder_factory.h" | |
15 #include "content/renderer/media/video_capture_impl_manager.h" | 16 #include "content/renderer/media/video_capture_impl_manager.h" |
16 #include "content/renderer/media/webaudio_capturer_source.h" | 17 #include "content/renderer/media/webaudio_capturer_source.h" |
17 #include "content/renderer/media/webrtc_audio_device_impl.h" | 18 #include "content/renderer/media/webrtc_audio_device_impl.h" |
18 #include "content/renderer/media/webrtc_local_audio_track.h" | 19 #include "content/renderer/media/webrtc_local_audio_track.h" |
19 #include "content/renderer/media/webrtc_uma_histograms.h" | 20 #include "content/renderer/media/webrtc_uma_histograms.h" |
20 #include "content/renderer/p2p/ipc_network_manager.h" | 21 #include "content/renderer/p2p/ipc_network_manager.h" |
21 #include "content/renderer/p2p/ipc_socket_factory.h" | 22 #include "content/renderer/p2p/ipc_socket_factory.h" |
22 #include "content/renderer/p2p/port_allocator.h" | 23 #include "content/renderer/p2p/port_allocator.h" |
23 #include "jingle/glue/thread_wrapper.h" | 24 #include "jingle/glue/thread_wrapper.h" |
24 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaConstraints .h" | 25 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaConstraints .h" |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
193 WebKit::WebMediaStream* description_; | 194 WebKit::WebMediaStream* description_; |
194 MediaStreamDependencyFactory::MediaSourcesCreatedCallback ready_callback_; | 195 MediaStreamDependencyFactory::MediaSourcesCreatedCallback ready_callback_; |
195 bool live_; | 196 bool live_; |
196 typedef std::vector<scoped_refptr<webrtc::MediaSourceInterface> > | 197 typedef std::vector<scoped_refptr<webrtc::MediaSourceInterface> > |
197 ObservedSources; | 198 ObservedSources; |
198 ObservedSources sources_; | 199 ObservedSources sources_; |
199 }; | 200 }; |
200 | 201 |
201 MediaStreamDependencyFactory::MediaStreamDependencyFactory( | 202 MediaStreamDependencyFactory::MediaStreamDependencyFactory( |
202 VideoCaptureImplManager* vc_manager, | 203 VideoCaptureImplManager* vc_manager, |
204 const scoped_refptr<media::GpuVideoDecoder::Factories>& gpu_factories, | |
203 P2PSocketDispatcher* p2p_socket_dispatcher) | 205 P2PSocketDispatcher* p2p_socket_dispatcher) |
204 : network_manager_(NULL), | 206 : network_manager_(NULL), |
205 vc_manager_(vc_manager), | 207 vc_manager_(vc_manager), |
208 gpu_factories_(gpu_factories), | |
206 p2p_socket_dispatcher_(p2p_socket_dispatcher), | 209 p2p_socket_dispatcher_(p2p_socket_dispatcher), |
207 signaling_thread_(NULL), | 210 signaling_thread_(NULL), |
208 worker_thread_(NULL), | 211 worker_thread_(NULL), |
209 chrome_worker_thread_("Chrome_libJingle_WorkerThread") { | 212 chrome_worker_thread_("Chrome_libJingle_WorkerThread"), |
213 decoder_worker_thread_("DecoderWorkerThread") { | |
210 } | 214 } |
211 | 215 |
212 MediaStreamDependencyFactory::~MediaStreamDependencyFactory() { | 216 MediaStreamDependencyFactory::~MediaStreamDependencyFactory() { |
213 CleanupPeerConnectionFactory(); | 217 CleanupPeerConnectionFactory(); |
214 } | 218 } |
215 | 219 |
216 WebKit::WebRTCPeerConnectionHandler* | 220 WebKit::WebRTCPeerConnectionHandler* |
217 MediaStreamDependencyFactory::CreateRTCPeerConnectionHandler( | 221 MediaStreamDependencyFactory::CreateRTCPeerConnectionHandler( |
218 WebKit::WebRTCPeerConnectionHandlerClient* client) { | 222 WebKit::WebRTCPeerConnectionHandlerClient* client) { |
219 // Save histogram data so we can see how much PeerConnetion is used. | 223 // Save histogram data so we can see how much PeerConnetion is used. |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
452 return type == WebKit::WebMediaStreamSource::TypeAudio ? | 456 return type == WebKit::WebMediaStreamSource::TypeAudio ? |
453 native_stream->RemoveTrack(native_stream->FindAudioTrack(track_id)) : | 457 native_stream->RemoveTrack(native_stream->FindAudioTrack(track_id)) : |
454 native_stream->RemoveTrack(native_stream->FindVideoTrack(track_id)); | 458 native_stream->RemoveTrack(native_stream->FindVideoTrack(track_id)); |
455 } | 459 } |
456 | 460 |
457 bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() { | 461 bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() { |
458 DVLOG(1) << "MediaStreamDependencyFactory::CreatePeerConnectionFactory()"; | 462 DVLOG(1) << "MediaStreamDependencyFactory::CreatePeerConnectionFactory()"; |
459 if (!pc_factory_) { | 463 if (!pc_factory_) { |
460 DCHECK(!audio_device_); | 464 DCHECK(!audio_device_); |
461 audio_device_ = new WebRtcAudioDeviceImpl(); | 465 audio_device_ = new WebRtcAudioDeviceImpl(); |
466 | |
467 scoped_ptr<RTCVideoDecoderFactory> decoder_factory; | |
468 if (gpu_factories_ != NULL && decoder_worker_thread_.IsRunning()) { | |
469 decoder_factory.reset(new RTCVideoDecoderFactory( | |
470 decoder_worker_thread_.message_loop_proxy(), gpu_factories_)); | |
Ami GONE FROM CHROMIUM
2013/05/14 22:57:24
Does this mean that the same gpu_factories will be
wuchengli
2013/05/15 15:30:46
I'm not sure which waitableevents are you talking
wuchengli
2013/05/20 14:32:15
I was thinking to move the creation of gpu_factori
| |
471 } | |
472 | |
462 scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory( | 473 scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory( |
463 webrtc::CreatePeerConnectionFactory(worker_thread_, | 474 webrtc::CreatePeerConnectionFactory(worker_thread_, |
464 signaling_thread_, | 475 signaling_thread_, |
465 audio_device_)); | 476 audio_device_, |
477 decoder_factory.release())); | |
466 if (factory) | 478 if (factory) |
467 pc_factory_ = factory; | 479 pc_factory_ = factory; |
468 else | 480 else |
469 audio_device_ = NULL; | 481 audio_device_ = NULL; |
470 } | 482 } |
471 return pc_factory_.get() != NULL; | 483 return pc_factory_.get() != NULL; |
472 } | 484 } |
473 | 485 |
474 bool MediaStreamDependencyFactory::PeerConnectionFactoryCreated() { | 486 bool MediaStreamDependencyFactory::PeerConnectionFactoryCreated() { |
475 return pc_factory_.get() != NULL; | 487 return pc_factory_.get() != NULL; |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
695 base::WaitableEvent event(true, false); | 707 base::WaitableEvent event(true, false); |
696 chrome_worker_thread_.message_loop()->PostTask(FROM_HERE, base::Bind( | 708 chrome_worker_thread_.message_loop()->PostTask(FROM_HERE, base::Bind( |
697 &MediaStreamDependencyFactory::InitializeWorkerThread, | 709 &MediaStreamDependencyFactory::InitializeWorkerThread, |
698 base::Unretained(this), | 710 base::Unretained(this), |
699 &worker_thread_, | 711 &worker_thread_, |
700 &event)); | 712 &event)); |
701 event.Wait(); | 713 event.Wait(); |
702 DCHECK(worker_thread_); | 714 DCHECK(worker_thread_); |
703 } | 715 } |
704 | 716 |
717 if (gpu_factories_ != NULL && !decoder_worker_thread_.IsRunning()) { | |
718 if (!decoder_worker_thread_.Start()) { | |
719 LOG(ERROR) << "Could not start decoder worker thread"; | |
720 } | |
721 } | |
722 | |
705 if (!network_manager_) { | 723 if (!network_manager_) { |
706 base::WaitableEvent event(true, false); | 724 base::WaitableEvent event(true, false); |
707 chrome_worker_thread_.message_loop()->PostTask(FROM_HERE, base::Bind( | 725 chrome_worker_thread_.message_loop()->PostTask(FROM_HERE, base::Bind( |
708 &MediaStreamDependencyFactory::CreateIpcNetworkManagerOnWorkerThread, | 726 &MediaStreamDependencyFactory::CreateIpcNetworkManagerOnWorkerThread, |
709 base::Unretained(this), | 727 base::Unretained(this), |
710 &event)); | 728 &event)); |
711 event.Wait(); | 729 event.Wait(); |
712 } | 730 } |
713 | 731 |
714 if (!socket_factory_) { | 732 if (!socket_factory_) { |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
747 // processed before returning. We wait for the above task to finish before | 765 // processed before returning. We wait for the above task to finish before |
748 // letting the the function continue to avoid any potential race issues. | 766 // letting the the function continue to avoid any potential race issues. |
749 chrome_worker_thread_.Stop(); | 767 chrome_worker_thread_.Stop(); |
750 } else { | 768 } else { |
751 NOTREACHED() << "Worker thread not running."; | 769 NOTREACHED() << "Worker thread not running."; |
752 } | 770 } |
753 } | 771 } |
754 } | 772 } |
755 | 773 |
756 } // namespace content | 774 } // namespace content |
OLD | NEW |