Mojify demuxers and allow running {Chunk/FFmpeg}Demuxer in a Utility Process

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 239 matching lines @@
 #endif
 
 #if defined(ENABLE_MOJO_MEDIA)
 #include "content/renderer/media/media_interface_provider.h"
 #endif
 
 #if defined(ENABLE_MOJO_CDM)
 #include "media/mojo/clients/mojo_cdm_factory.h"  // nogncheck
 #endif
 
+#if defined(ENABLE_MOJO_DEMUXER)
+#include "media/mojo/clients/mojo_demuxer_factory.h"  // nogncheck
+#else
+#include "media/filters/default_demuxer_factory.h"
+#endif
+
 #if defined(ENABLE_MOJO_RENDERER)
 #include "media/mojo/clients/mojo_renderer_factory.h"  // nogncheck
 #endif
 
 #if !defined(ENABLE_MOJO_RENDERER) || \
     BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
 #include "media/renderers/default_renderer_factory.h"  // nogncheck
 #endif
 
 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER)
@@ skipping 2582 matching lines @@
       // in the renderer process. See https://crbug.com/681160.
       GetWebkitPreferences().max_keyframe_distance_to_disable_background_video,
       GetWebkitPreferences().enable_instant_source_buffer_gc,
       GetContentClient()->renderer()->AllowMediaSuspend());
 
   bool use_fallback_path = false;
 #if defined(OS_ANDROID)
   use_fallback_path = !UseWebMediaPlayerImpl(url);
 #endif  // defined(OS_ANDROID)
 
+  std::unique_ptr<media::DemuxerFactory> media_demuxer_factory;
   std::unique_ptr<media::RendererFactory> media_renderer_factory;
   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()));
 #endif  // defined(OS_ANDROID)
   } else {
+#if defined(ENABLE_MOJO_DEMUXER) && defined(ENABLE_MOJO_RENDERER)
+    media_demuxer_factory = base::MakeUnique<media::MojoDemuxerFactory>(
+        GetMediaInterfaceProvider());
+#else
+    media_demuxer_factory =
+        base::MakeUnique<media::DefaultDemuxerFactory>(media_log);
+#endif
+
 #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, GetDecoderFactory(),
           base::Bind(&RenderThreadImpl::GetGpuFactories,
                      base::Unretained(render_thread)));
     }
 #endif  // BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
@@ skipping 17 matching lines @@
   media_renderer_factory =
       base::MakeUnique<media::remoting::AdaptiveRendererFactory>(
           std::move(media_renderer_factory), std::move(remoting_controller));
 #endif
 
   if (!url_index_.get() || url_index_->frame() != frame_)
     url_index_.reset(new media::UrlIndex(frame_));
 
   media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
       frame_, client, encrypted_client, GetWebMediaPlayerDelegate(),
-      std::move(media_renderer_factory), url_index_, params);
+      std::move(media_demuxer_factory), 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  // defined(OS_ANDROID)
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
   remoting_controller_ptr->SetSwitchRendererCallback(base::Bind(
       &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr()));
@@ skipping 3883 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