Index: content/renderer/media/media_stream_dependency_factory.cc |
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc |
index a0f8468699f59b71399f6330c54ccc55ea517dc6..0d28505b6017c5bed883cc0434e62b3dcf299977 100644 |
--- a/content/renderer/media/media_stream_dependency_factory.cc |
+++ b/content/renderer/media/media_stream_dependency_factory.cc |
@@ -11,9 +11,11 @@ |
#include "base/utf_string_conversions.h" |
#include "content/public/common/content_switches.h" |
#include "content/renderer/media/media_stream_source_extra_data.h" |
+#include "content/renderer/media/renderer_gpu_video_decoder_factories.h" |
#include "content/renderer/media/rtc_media_constraints.h" |
#include "content/renderer/media/rtc_peer_connection_handler.h" |
#include "content/renderer/media/rtc_video_capturer.h" |
+#include "content/renderer/media/rtc_video_decoder_factory.h" |
#include "content/renderer/media/video_capture_impl_manager.h" |
#include "content/renderer/media/webaudio_capturer_source.h" |
#include "content/renderer/media/webrtc_audio_device_impl.h" |
@@ -479,9 +481,28 @@ bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() { |
if (!pc_factory_) { |
DCHECK(!audio_device_); |
audio_device_ = new WebRtcAudioDeviceImpl(); |
+ |
+ const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
+ scoped_ptr<RTCVideoDecoderFactory> decoder_factory; |
+ scoped_refptr<content::RendererGpuVideoDecoderFactories> gpu_factories; |
+ if (cmd_line->HasSwitch(switches::kEnableWebRTCHWDecoding)) { |
+ scoped_ptr<base::Thread> vda_thread(new base::Thread("VDA_thread")); |
+ if (vda_thread->Start()) { |
+ gpu_factories = RenderThreadImpl::current()->GetGpuFactories( |
+ vda_thread->message_loop_proxy()); |
+ } else { |
+ LOG(ERROR) << "Could not start VDA thread"; |
+ } |
+ if (gpu_factories != NULL) { |
+ decoder_factory.reset( |
+ new RTCVideoDecoderFactory(gpu_factories, vda_thread.Pass())); |
+ } |
+ } |
+ |
scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory( |
webrtc::CreatePeerConnectionFactory( |
- worker_thread_, signaling_thread_, audio_device_, NULL, NULL)); |
+ worker_thread_, signaling_thread_, audio_device_, NULL, |
+ decoder_factory.release())); |
if (factory) |
pc_factory_ = factory; |
else |