Integrate VDA with WebRTC.

content/renderer/media/media_stream_dependency_factory.cc

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 421bfacfb8e34bdc5c8a0827b5a886f712e0a01a..d01d4dd617517194506f2bf6c70c3a477b777a7f 100644
--- a/content/renderer/media/media_stream_dependency_factory.cc
+++ b/content/renderer/media/media_stream_dependency_factory.cc
@@ -12,6 +12,7 @@
 #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"
@@ -200,13 +201,16 @@ class SourceStateObserver : public webrtc::ObserverInterface,
 
 MediaStreamDependencyFactory::MediaStreamDependencyFactory(
     VideoCaptureImplManager* vc_manager,
+    const scoped_refptr<media::GpuVideoDecoder::Factories>& gpu_factories,
     P2PSocketDispatcher* p2p_socket_dispatcher)
     : network_manager_(NULL),
       vc_manager_(vc_manager),
+      gpu_factories_(gpu_factories),
       p2p_socket_dispatcher_(p2p_socket_dispatcher),
       signaling_thread_(NULL),
       worker_thread_(NULL),
-      chrome_worker_thread_("Chrome_libJingle_WorkerThread") {
+      chrome_worker_thread_("Chrome_libJingle_WorkerThread"),
+      decoder_worker_thread_("DecoderWorkerThread") {
 }
 
 MediaStreamDependencyFactory::~MediaStreamDependencyFactory() {
@@ -459,10 +463,18 @@ bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() {
   if (!pc_factory_) {
     DCHECK(!audio_device_);
     audio_device_ = new WebRtcAudioDeviceImpl();
+
+    scoped_ptr<RTCVideoDecoderFactory> decoder_factory;
+    if (gpu_factories_ != NULL && decoder_worker_thread_.IsRunning()) {
+      decoder_factory.reset(new RTCVideoDecoderFactory(
+              decoder_worker_thread_.message_loop_proxy(), gpu_factories_));
+    }
+
     scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory(
         webrtc::CreatePeerConnectionFactory(worker_thread_,
                                             signaling_thread_,
-                                            audio_device_));
+                                            audio_device_,
+                                            decoder_factory.release()));
     if (factory)
       pc_factory_ = factory;
     else
@@ -702,6 +714,12 @@ bool MediaStreamDependencyFactory::EnsurePeerConnectionFactory() {
     DCHECK(worker_thread_);
   }
 
+  if (gpu_factories_ != NULL && !decoder_worker_thread_.IsRunning()) {
+    if (!decoder_worker_thread_.Start()) {
+      LOG(ERROR) << "Could not start decoder worker thread";
+    }
+  }
+
   if (!network_manager_) {
     base::WaitableEvent event(true, false);
     chrome_worker_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(