Chromium Code Reviews| 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") { |
| 210 } | 213 } |
| 211 | 214 |
| 212 MediaStreamDependencyFactory::~MediaStreamDependencyFactory() { | 215 MediaStreamDependencyFactory::~MediaStreamDependencyFactory() { |
| 213 CleanupPeerConnectionFactory(); | 216 CleanupPeerConnectionFactory(); |
| 214 } | 217 } |
| 215 | 218 |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 452 return type == WebKit::WebMediaStreamSource::TypeAudio ? | 455 return type == WebKit::WebMediaStreamSource::TypeAudio ? |
| 453 native_stream->RemoveTrack(native_stream->FindAudioTrack(track_id)) : | 456 native_stream->RemoveTrack(native_stream->FindAudioTrack(track_id)) : |
| 454 native_stream->RemoveTrack(native_stream->FindVideoTrack(track_id)); | 457 native_stream->RemoveTrack(native_stream->FindVideoTrack(track_id)); |
| 455 } | 458 } |
| 456 | 459 |
| 457 bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() { | 460 bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() { |
| 458 DVLOG(1) << "MediaStreamDependencyFactory::CreatePeerConnectionFactory()"; | 461 DVLOG(1) << "MediaStreamDependencyFactory::CreatePeerConnectionFactory()"; |
| 459 if (!pc_factory_) { | 462 if (!pc_factory_) { |
| 460 DCHECK(!audio_device_); | 463 DCHECK(!audio_device_); |
| 461 audio_device_ = new WebRtcAudioDeviceImpl(); | 464 audio_device_ = new WebRtcAudioDeviceImpl(); |
| 465 | |
| 466 scoped_ptr<RTCVideoDecoderFactory> decoder_factory; | |
| 467 if (gpu_factories_ != NULL) { | |
| 468 decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories_)); | |
|
Ami GONE FROM CHROMIUM
2013/05/29 21:11:46
There's an off-reviewlog thread about this, so I'm
wuchengli
2013/06/10 12:33:42
Now gpu_factories_ is copied for every video decod
| |
| 469 } | |
| 470 | |
| 462 scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory( | 471 scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory( |
| 463 webrtc::CreatePeerConnectionFactory(worker_thread_, | 472 webrtc::CreatePeerConnectionFactory(worker_thread_, |
| 464 signaling_thread_, | 473 signaling_thread_, |
| 465 audio_device_)); | 474 audio_device_, |
| 475 decoder_factory.release())); | |
| 466 if (factory) | 476 if (factory) |
| 467 pc_factory_ = factory; | 477 pc_factory_ = factory; |
| 468 else | 478 else |
| 469 audio_device_ = NULL; | 479 audio_device_ = NULL; |
| 470 } | 480 } |
| 471 return pc_factory_.get() != NULL; | 481 return pc_factory_.get() != NULL; |
| 472 } | 482 } |
| 473 | 483 |
| 474 bool MediaStreamDependencyFactory::PeerConnectionFactoryCreated() { | 484 bool MediaStreamDependencyFactory::PeerConnectionFactoryCreated() { |
| 475 return pc_factory_.get() != NULL; | 485 return pc_factory_.get() != NULL; |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 747 // processed before returning. We wait for the above task to finish before | 757 // processed before returning. We wait for the above task to finish before |
| 748 // letting the the function continue to avoid any potential race issues. | 758 // letting the the function continue to avoid any potential race issues. |
| 749 chrome_worker_thread_.Stop(); | 759 chrome_worker_thread_.Stop(); |
| 750 } else { | 760 } else { |
| 751 NOTREACHED() << "Worker thread not running."; | 761 NOTREACHED() << "Worker thread not running."; |
| 752 } | 762 } |
| 753 } | 763 } |
| 754 } | 764 } |
| 755 | 765 |
| 756 } // namespace content | 766 } // namespace content |
| OLD | NEW |