Register MediaPlayerRenderer service

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index a4c0acb265cac6809c543044afa7ff0b5aa2f118..ddfedb5b2ac7599d0b0b69d565009d49777284f6 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -88,9 +88,11 @@
 #include "device/generic_sensor/sensor_provider_impl.h"
 #include "device/geolocation/geolocation_service_context.h"
 #include "device/vibration/vibration_manager_impl.h"
+#include "media/media_features.h"
 #include "media/mojo/interfaces/media_service.mojom.h"
 #include "media/mojo/interfaces/service_factory.mojom.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/interface_provider.h"
 #include "ui/accessibility/ax_tree.h"
@@ -105,6 +107,16 @@
 #endif
 #endif
 
+#if BUILDFLAG(ENABLE_MOJO_MEDIA_PLAYER_RENDERER)
+#include "content/browser/media/android/media_player_renderer.h"
+// TODO(tguilbert): For-reviewers -- Is there a convenient way to get rid of the
+// dependency on these files? MojoRendererService complains about incomplete
+// types because there is no move ctor define, but they aren't actually used...
+#include "media/base/audio_renderer_sink.h"
+#include "media/base/video_renderer_sink.h"
+#include "media/mojo/services/mojo_renderer_service.h"
+#endif
+
 #if defined(OS_MACOSX)
 #include "content/browser/frame_host/popup_menu_helper_mac.h"
 #endif
@@ -2108,6 +2120,25 @@ void RenderFrameHostImpl::OnHidePopup() {
 }
 #endif
 
+#if BUILDFLAG(ENABLE_MOJO_MEDIA_PLAYER_RENDERER)

[liberato (no reviews please), 2016/10/06 14:55:46]

have you considered a runtime flag instead of (or in addition to) a compile-time
flag?  this will let us test with a finch experiment.  it will also let us get
results in the a/v lab for wmpa vs mediaplayerrenderer.

it's really easy with base::Feature.  see
https://cs.chromium.org/chromium/src/media/base/media_switches.h?rcl=0&l=89 .

[tguilbert, 2016/10/11 18:54:33]

Added.

+void CreateMediaPlayerRenderer(
+    content::RenderFrameHost* render_frame_host,
+    mojo::InterfaceRequest<media::mojom::Renderer> request) {
+  std::unique_ptr<MediaPlayerRenderer> renderer =
+      base::MakeUnique<MediaPlayerRenderer>(render_frame_host);
+
+  // base::Unretained is safe here because the lifetime of the MediaPlayerRender
+  // is tied to the lifetime of the MojoRendererService.
+  media::MojoRendererService::InitiateSurfaceRequestCB surface_request_cb =
+      base::Bind(&MediaPlayerRenderer::InitiateScopedSurfaceRequest,
+                 base::Unretained(renderer.get()));
+
+  media::MojoRendererService::Create(nullptr, nullptr, nullptr,
+                                     std::move(renderer), surface_request_cb,
+                                     std::move(request));
+}
+#endif
+
 void RenderFrameHostImpl::RegisterMojoInterfaces() {
   device::GeolocationServiceContext* geolocation_service_context =
       delegate_ ? delegate_->GetGeolocationServiceContext() : NULL;
@@ -2196,6 +2227,12 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
         BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
   }
 
+#if BUILDFLAG(ENABLE_MOJO_MEDIA_PLAYER_RENDERER)
+  // Creates a MojoRendererService, passing it a MediaPlayerRender.
+  GetInterfaceRegistry()->AddInterface<media::mojom::Renderer>(
+      base::Bind(&content::CreateMediaPlayerRenderer, base::Unretained(this)));
+#endif
+
   GetContentClient()->browser()->RegisterRenderFrameMojoInterfaces(
       GetInterfaceRegistry(), this);
 }