Add RendererFactorySelector

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 142 matching lines @@
 #include "gin/modules/console.h"
 #include "gin/modules/module_registry.h"
 #include "gin/modules/timer.h"
 #include "media/audio/audio_output_device.h"
 #include "media/base/audio_renderer_mixer_input.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/decoder_factory.h"
 #include "media/base/media.h"
 #include "media/base/media_log.h"
 #include "media/base/media_switches.h"
+#include "media/base/renderer_factory_selector.h"
 #include "media/blink/url_index.h"
 #include "media/blink/webencryptedmediaclient_impl.h"
 #include "media/blink/webmediaplayer_impl.h"
 #include "media/media_features.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "mojo/edk/js/core.h"
 #include "mojo/edk/js/support.h"
 #include "net/base/data_url.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
@@ skipping 2711 matching lines @@
   // a new player id which is used to collate logs on the browser side.
   std::unique_ptr<media::MediaLog> media_log(
       new RenderMediaLog(url::Origin(security_origin).GetURL()));
 
   bool use_fallback_path = false;
 #if defined(OS_ANDROID)
   use_fallback_path = UseMediaPlayerRenderer(url);
 #endif  // defined(OS_ANDROID)
 
   std::unique_ptr<media::RendererFactory> media_renderer_factory;
+  media::RendererFactorySelector::FactoryType factory_type;
   if (use_fallback_path) {
 #if defined(OS_ANDROID)
     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->EnableStreamTextureCopy(),
                    render_thread->GetStreamTexureFactory(),
                    base::ThreadTaskRunnerHandle::Get()));
+
+    factory_type = media::RendererFactorySelector::FactoryType::MEDIA_PLAYER;
 #endif  // defined(OS_ANDROID)
   } else {
 #if defined(ENABLE_MOJO_RENDERER)
 #if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kDisableMojoRenderer)) {
       media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>(
           media_log.get(), GetDecoderFactory(),
           base::Bind(&RenderThreadImpl::GetGpuFactories,
                      base::Unretained(render_thread)));
+
+      factory_type = media::RendererFactorySelector::FactoryType::DEFAULT;
     }
 #endif  // BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
     if (!media_renderer_factory) {
       media_renderer_factory = base::MakeUnique<media::MojoRendererFactory>(
           base::Bind(&RenderThreadImpl::GetGpuFactories,
                      base::Unretained(render_thread)),
           GetMediaInterfaceProvider());
+
+      factory_type = media::RendererFactorySelector::FactoryType::MOJO;
     }
 #else
     media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>(
         media_log.get(), GetDecoderFactory(),
         base::Bind(&RenderThreadImpl::GetGpuFactories,
                    base::Unretained(render_thread)));
+
+    factory_type = media::RendererFactorySelector::FactoryType::DEFAULT;
 #endif  // defined(ENABLE_MOJO_RENDERER)
   }
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
   media_renderer_factory =
       base::MakeUnique<media::remoting::AdaptiveRendererFactory>(
           std::move(media_renderer_factory), std::move(remoting_controller));

[ncarter (slow), 2017/04/24 17:14:33]

This step looks little strange to me -- since the adaptive renderer factory
appears to wrap an underlying factory, ADAPTIVE is going to be the default on
all desktop platforms: ENABLE_MEDIA_REMOTING ==
 (!is_chromecast && !is_ios && !is_android).

If the ADAPTIVE case erases the info about the underlying factory type, doesn't
that run counter to the goal of tracking what type of factory is being used?

[tguilbert, 2017/04/24 19:31:16]

It does :) One of the RendererFactorySelector's goals is to move the decision
logic out of the AdaptiveRendererFactory. I am addressing it in CL #3
https://codereview.chromium.org/2826883002/

[ncarter (slow), 2017/04/24 19:50:29]

lgtm then

+
+  factory_type = media::RendererFactorySelector::FactoryType::ADAPTIVE;
 #endif
 
   if (!url_index_.get() || url_index_->frame() != frame_)
     url_index_.reset(new media::UrlIndex(frame_));
 
+  auto factory_selector = base::MakeUnique<media::RendererFactorySelector>();
+
+  factory_selector->AddFactory(factory_type, std::move(media_renderer_factory));
+  factory_selector->SetBaseFactoryType(factory_type);
+
   std::unique_ptr<media::WebMediaPlayerParams> params(
       new media::WebMediaPlayerParams(
           std::move(media_log),
           base::Bind(&ContentRendererClient::DeferMediaLoad,
                      base::Unretained(GetContentClient()->renderer()),
                      static_cast<RenderFrame*>(this),
                      GetWebMediaPlayerDelegate()->has_played_media()),
           audio_renderer_sink, 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_, media_observer,
           max_keyframe_distance_to_disable_background_video,
           max_keyframe_distance_to_disable_background_video_mse,
           GetWebkitPreferences().enable_instant_source_buffer_gc,
           GetContentClient()->renderer()->AllowMediaSuspend(),
           embedded_media_experience_enabled));
 
   media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
       frame_, client, encrypted_client, GetWebMediaPlayerDelegate(),
-      std::move(media_renderer_factory), url_index_, std::move(params));
+      std::move(factory_selector), url_index_, std::move(params));
 
 #if defined(OS_ANDROID)  // WMPI_CAST
   media_player->SetMediaPlayerManager(GetMediaPlayerManager());
   media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor());
   media_player->SetUseFallbackPath(use_fallback_path);
 #endif  // defined(OS_ANDROID)
 
   return media_player;
 }
 
@@ skipping 4005 matching lines @@
       policy(info.default_policy),
       replaces_current_history_item(info.replaces_current_history_item),
       history_navigation_in_new_child_frame(
           info.is_history_navigation_in_new_child_frame),
       client_redirect(info.is_client_redirect),
       cache_disabled(info.is_cache_disabled),
       form(info.form),
       source_location(info.source_location) {}
 
 }  // namespace content