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

media/mojo/services/utility_mojo_media_client.cc

 // Copyright 2017 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 "media/mojo/services/utility_mojo_media_client.h"
 
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/audio/null_audio_sink.h"
 #include "media/base/media.h"
 #include "media/base/video_decoder.h"
+#include "media/filters/default_demuxer_factory.h"
 #include "media/mojo/common/mojo_shared_buffer_video_frame.h"
 #include "media/mojo/common/mojo_video_frame_provider.h"
 #include "media/mojo/common/mojo_video_frame_provider_factory.h"
 #include "media/mojo/services/mojo_audio_renderer_sink_adapter.h"
 #include "media/mojo/services/mojo_video_renderer_sink_adapter.h"
 #include "media/renderers/default_renderer_factory.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 
 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
 #include "media/filters/ffmpeg_video_decoder.h"
 #endif
 
+#if !defined(MEDIA_DISABLE_LIBVPX)
+#include "media/filters/vpx_video_decoder.h"
+#endif
+
 namespace media {
 
 UtilityMojoMediaClient::UtilityMojoMediaClient(
     scoped_refptr<base::SingleThreadTaskRunner> utility_task_runner)
     : utility_task_runner_(std::move(utility_task_runner)) {}
 
 UtilityMojoMediaClient::~UtilityMojoMediaClient() {}
 
 void UtilityMojoMediaClient::Initialize(service_manager::Connector* connector) {
   InitializeMediaLibrary();
@@ skipping 28 matching lines @@
 std::unique_ptr<RendererFactory> UtilityMojoMediaClient::CreateRendererFactory(
     const scoped_refptr<MediaLog>& media_log) {
   std::unique_ptr<VideoFrameProviderFactory> video_frame_provider_factory(
       new MojoVideoFrameProviderFactory());
   return base::MakeUnique<DefaultRendererFactory>(
       std::move(media_log), nullptr,
       DefaultRendererFactory::GetGpuFactoriesCB(),
       std::move(video_frame_provider_factory));
 }
 
+std::unique_ptr<DemuxerFactory> UtilityMojoMediaClient::CreateDemuxerFactory(
+    const scoped_refptr<MediaLog>& media_log) {
+  return base::MakeUnique<DefaultDemuxerFactory>(std::move(media_log));
+}
+
 }  // namespace media