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

media/mojo/services/interface_factory_impl.cc

Index: media/mojo/services/interface_factory_impl.cc
diff --git a/media/mojo/services/interface_factory_impl.cc b/media/mojo/services/interface_factory_impl.cc
index 5277a8e418d8fa47d1d039dea5d90cdc75b58ad1..62ed4b6edf24b7852cb64ec5d054697589678bc1 100644
--- a/media/mojo/services/interface_factory_impl.cc
+++ b/media/mojo/services/interface_factory_impl.cc
@@ -33,6 +33,12 @@
 #include "media/mojo/services/mojo_cdm_service.h"
 #endif  // defined(ENABLE_MOJO_CDM)
 
+#if defined(ENABLE_MOJO_DEMUXER)
+#include "media/base/demuxer_factory.h"
+#include "media/mojo/services/mojo_demuxer_service.h"
+#include "media/mojo/services/mojo_source_buffer_service.h"
+#endif  // defined(ENABLE_MOJO_DEMUXER)
+
 namespace media {
 
 InterfaceFactoryImpl::InterfaceFactoryImpl(
@@ -41,7 +47,7 @@ InterfaceFactoryImpl::InterfaceFactoryImpl(
     std::unique_ptr<service_manager::ServiceContextRef> connection_ref,
     MojoMediaClient* mojo_media_client)
     :
-#if defined(ENABLE_MOJO_CDM)
+#if defined(ENABLE_MOJO_CDM) || defined(ENABLE_MOJO_DEMUXER)
       interfaces_(std::move(interfaces)),
 #endif
       media_log_(media_log),
@@ -57,6 +63,28 @@ InterfaceFactoryImpl::~InterfaceFactoryImpl() {
 
 // mojom::InterfaceFactory implementation.
 
+void InterfaceFactoryImpl::CreateDemuxer(mojom::DemuxerRequest request) {
+#if defined(ENABLE_MOJO_DEMUXER)
+  DemuxerFactory* demuxer_factory = GetDemuxerFactory();
+  if (!demuxer_factory)
+    return;
+
+  demuxer_bindings_.AddBinding(
+      base::MakeUnique<MojoDemuxerService>(
+          demuxer_service_context_.GetWeakPtr(), demuxer_factory),
+      std::move(request));
+#endif  // defined(ENABLE_MOJO_DEMUXER)
+}
+
+void InterfaceFactoryImpl::CreateSourceBuffer(
+    mojom::SourceBufferRequest request) {
+#if defined(ENABLE_MOJO_DEMUXER)
+  source_buffer_bindings_.AddBinding(base::MakeUnique<MojoSourceBufferService>(
+                                         demuxer_service_context_.GetWeakPtr()),
+                                     std::move(request));
+#endif  // defined(ENABLE_MOJO_DEMUXER)
+}
+
 void InterfaceFactoryImpl::CreateAudioDecoder(
     mojo::InterfaceRequest<mojom::AudioDecoder> request) {
 #if defined(ENABLE_MOJO_AUDIO_DECODER)
@@ -109,6 +137,7 @@ void InterfaceFactoryImpl::CreateRenderer(
 
   std::unique_ptr<MojoRendererService> mojo_renderer_service =
       base::MakeUnique<MojoRendererService>(
+          demuxer_service_context_.GetWeakPtr(),
           cdm_service_context_.GetWeakPtr(), std::move(audio_sink),
           std::move(video_sink), std::move(renderer),
           MojoRendererService::InitiateSurfaceRequestCB());
@@ -160,4 +189,14 @@ CdmFactory* InterfaceFactoryImpl::GetCdmFactory() {
 }
 #endif  // defined(ENABLE_MOJO_CDM)
 
+#if defined(ENABLE_MOJO_DEMUXER)
+DemuxerFactory* InterfaceFactoryImpl::GetDemuxerFactory() {
+  if (!demuxer_factory_) {
+    demuxer_factory_ = mojo_media_client_->CreateDemuxerFactory(media_log_);
+    LOG_IF(ERROR, !demuxer_factory_) << "DemuxerFactory not available.";
+  }
+  return demuxer_factory_.get();
+}
+#endif  // defined(ENABLE_MOJO_CDM)
+
 }  // namespace media