Integrate VDA with WebRTC.

content/renderer/render_thread_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 98 matching lines @@
 #endif
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #endif
 
 #if defined(ENABLE_WEBRTC)
 #include "third_party/webrtc/system_wrappers/interface/event_tracer.h"
 #endif
 
+#include "content/renderer/media/renderer_gpu_video_decoder_factories.h"

[Pawel Osciak, 2013/04/26 07:08:01]

This seems out of place

[wuchengli, 2013/04/26 11:49:14]

Done.

+
 using WebKit::WebDocument;
 using WebKit::WebFrame;
 using WebKit::WebNetworkStateNotifier;
 using WebKit::WebRuntimeFeatures;
 using WebKit::WebScriptController;
 using WebKit::WebSecurityPolicy;
 using WebKit::WebString;
 using WebKit::WebView;
 
 namespace content {
@@ skipping 1096 matching lines @@
           client, GetMediaStreamDependencyFactory());
     }
   }
 #endif
   return media_stream_center_;
 }
 
 MediaStreamDependencyFactory*
 RenderThreadImpl::GetMediaStreamDependencyFactory() {
 #if defined(ENABLE_WEBRTC)
+  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories;
+  WebGraphicsContext3DCommandBufferImpl* context3d = NULL;
+  if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode))

[Ami GONE FROM CHROMIUM, 2013/04/26 00:42:05]

IWBN to avoid the code duplication between here and
RenderViewImpl::createMediaPlayer().  Does it make sense to extract to a helper
in RVI and have RVI pass the (possibly-NULL) |gpu_factories| to this method?

[wuchengli, 2013/04/26 11:49:14]

I added a line here. Also, I could not find a good way to extract it in
RenderViewImpl because EnsureMediaStreamImpl is called by two places there.
On 2013/04/26 00:42:05, Ami Fischman wrote:

[wuchengli, 2013/05/08 15:58:56]

GetMediaStreamDependencyFactory is also called by other methods in
RenderThreadImpl. So gpu_factories cannot be passed from from RenderViewImpl. I
extracted this to a new method in RenderThreadImpl and let RenderViewImpl call
it.
On 2013/04/26 11:49:14, wuchengli wrote:

+    context3d = RenderThreadImpl::current()->GetGpuVDAContext3D();
+  if (context3d) {
+    scoped_refptr<base::MessageLoopProxy> factories_loop =
+        RenderThreadImpl::current()->compositor_message_loop_proxy();
+    if (!factories_loop)
+      factories_loop = base::MessageLoopProxy::current();
+    GpuChannelHost* gpu_channel_host =
+        RenderThreadImpl::current()->EstablishGpuChannelSync(
+            CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
+    gpu_factories = new RendererGpuVideoDecoderFactories(
+        gpu_channel_host, factories_loop, context3d);
+  }
   if (!media_stream_factory_.get()) {
     media_stream_factory_.reset(new MediaStreamDependencyFactory(
-        vc_manager_, p2p_socket_dispatcher_));
+        vc_manager_, gpu_factories, p2p_socket_dispatcher_));
   }
 #endif
   return media_stream_factory_.get();
 }
 
 GpuChannelHost* RenderThreadImpl::GetGpuChannel() {
   if (!gpu_channel_.get())
     return NULL;
 
   if (gpu_channel_->state() != GpuChannelHost::kConnected)
@@ skipping 41 matching lines @@
 
 void RenderThreadImpl::SetFlingCurveParameters(
     const std::vector<float>& new_touchpad,
     const std::vector<float>& new_touchscreen) {
   webkit_platform_support_->SetFlingCurveParameters(new_touchpad,
                                                     new_touchscreen);
 
 }
 
 }  // namespace content