Register MediaPlayerRenderer service

content/renderer/render_frame_impl.cc

 // Copyright 2013 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_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 201 matching lines @@
 #endif
 
 #if defined(ENABLE_WEBRTC)
 #include "content/renderer/media/rtc_peer_connection_handler.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include <cpu-features.h>
 
 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
+#include "content/renderer/media/android/media_player_renderer_client_factory.h"
 #include "content/renderer/media/android/renderer_media_player_manager.h"
 #include "content/renderer/media/android/renderer_surface_view_manager.h"
 #include "content/renderer/media/android/stream_texture_factory.h"
+#include "content/renderer/media/android/stream_texture_wrapper_impl.h"
 #include "content/renderer/media/android/webmediaplayer_android.h"
 #include "media/base/android/media_codec_util.h"
+#include "media/mojo/clients/mojo_renderer_factory.h"  // nogncheck
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #endif
 
 #if defined(ENABLE_PEPPER_CDMS)
 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h"
 #include "content/renderer/media/cdm/render_cdm_factory.h"
 #endif
 
 #if defined(ENABLE_MOJO_MEDIA)
 #include "content/renderer/media/media_interface_provider.h"
@@ skipping 2452 matching lines @@
                  base::Unretained(GetContentClient()->renderer()),
                  static_cast<RenderFrame*>(this),
                  GetWebMediaPlayerDelegate()->has_played_media()),
       audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(),
       render_thread->GetWorkerTaskRunner(),
       render_thread->compositor_task_runner(), context_3d_cb,
       base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory,
                  base::Unretained(blink::mainThreadIsolate())),
       initial_cdm, media_surface_manager_);
 
+  bool use_fallback_path = false;
 #if defined(OS_ANDROID)
-  if (!UseWebMediaPlayerImpl(url)) {
+  use_fallback_path = !UseWebMediaPlayerImpl(url);
+
+  if (use_fallback_path &&
+      !base::FeatureList::IsEnabled(media::kEnableMediaPlayerRenderer)) {
     return CreateAndroidWebMediaPlayer(client, encrypted_client, params);
   }
 #endif  // defined(OS_ANDROID)
 
+  std::unique_ptr<media::RendererFactory> media_renderer_factory;
+  if (use_fallback_path) {
+    auto mojo_renderer_factory = base::MakeUnique<media::MojoRendererFactory>(
+        media::MojoRendererFactory::GetGpuFactoriesCB(),
+        GetRemoteInterfaces()->get());
+
+    media_renderer_factory = base::MakeUnique<MediaPlayerRendererClientFactory>(
+        render_thread->compositor_task_runner(),
+        std::move(mojo_renderer_factory),
+        base::Bind(&StreamTextureWrapperImpl::Create,
+                   render_thread->GetStreamTexureFactory(),
+                   base::ThreadTaskRunnerHandle::Get()));
+  } else {

[xhwang, 2016/10/12 20:14:15]

Drive-by comment: Does it make sense to put this block under "#if
defined(OS_ANDROID)" so that we don't link in unnecessary classes on non-android
platforms? The compiler/linker might be smart enough to figure out
|use_fallback_path| is always false on non-android platforms, but I am not sure.

[tguilbert, 2016/10/12 21:46:24]

I think the compiler is smart enough, but I don't have the definitive data to
prove it. Adding the #if defined(OS_ANDROID) to make it extra clear (and avoid
problems if someone were to compile while explicitly disabling optimizations)

 #if defined(ENABLE_MOJO_RENDERER)
-  std::unique_ptr<media::RendererFactory> media_renderer_factory(
-      new media::MojoRendererFactory(
-          base::Bind(&RenderThreadImpl::GetGpuFactories,
-                     base::Unretained(render_thread)),
-          GetMediaInterfaceProvider()));
+    media_renderer_factory = base::MakeUnique<media::MojoRendererFactory>(
+        base::Bind(&RenderThreadImpl::GetGpuFactories,
+                   base::Unretained(render_thread)),
+        GetMediaInterfaceProvider());
 #else
-  std::unique_ptr<media::RendererFactory> media_renderer_factory(
-      new media::DefaultRendererFactory(
-          media_log, GetDecoderFactory(),
-          base::Bind(&RenderThreadImpl::GetGpuFactories,
-                     base::Unretained(render_thread))));
+    media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>(
+        media_log, GetDecoderFactory(),
+        base::Bind(&RenderThreadImpl::GetGpuFactories,
+                   base::Unretained(render_thread)));
 #endif  // defined(ENABLE_MOJO_RENDERER)
+  }
 
   if (!url_index_.get() || url_index_->frame() != frame_)
     url_index_.reset(new media::UrlIndex(frame_));
 
   // TODO(miu): In a soon-upcoming change, call GetRemoterFactory()->Create() to
   // allow the local media pipeline to receive notifications about when Media
   // Remoting can take place. Control logic in/around WebMediaPlayerImpl will
   // implement media.mojom.RemotingSource. http://crbug.com/643964
 
   media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
       frame_, client, encrypted_client,
       GetWebMediaPlayerDelegate()->AsWeakPtr(),
       std::move(media_renderer_factory), url_index_, params);
 
 #if defined(OS_ANDROID)  // WMPI_CAST
   media_player->SetMediaPlayerManager(GetMediaPlayerManager());
   media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor());
+  media_player->SetUseFallbackPath(use_fallback_path);
 #endif
 
   return media_player;
 }
 
 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
     blink::WebApplicationCacheHostClient* client) {
   if (!frame_ || !frame_->view())
     return NULL;
   return new RendererWebApplicationCacheHostImpl(
@@ skipping 3497 matching lines @@
       frame_, client, encrypted_client,
       GetWebMediaPlayerDelegate()->AsWeakPtr(), GetMediaPlayerManager(),
       stream_texture_factory, routing_id_, enable_texture_copy, params);
 }
 
 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() {
   if (!media_player_manager_)
     media_player_manager_ = new RendererMediaPlayerManager(this);
   return media_player_manager_;
 }
-
 #endif  // defined(OS_ANDROID)
 
 media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
   if (!media_permission_dispatcher_) {
     media_permission_dispatcher_.reset(new MediaPermissionDispatcher(base::Bind(
         &RenderFrameImpl::GetInterface<blink::mojom::PermissionService>,
         base::Unretained(this))));
   }
   return media_permission_dispatcher_.get();
 }
@@ skipping 221 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content