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

media/mojo/services/interface_factory_impl.cc

 // Copyright 2015 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/interface_factory_impl.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/base/media_log.h"
@@ skipping 15 matching lines @@
 #include "media/base/renderer_factory.h"
 #include "media/base/video_renderer_sink.h"
 #include "media/mojo/services/mojo_renderer_service.h"
 #endif  // defined(ENABLE_MOJO_RENDERER)
 
 #if defined(ENABLE_MOJO_CDM)
 #include "media/base/cdm_factory.h"
 #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(
     service_manager::mojom::InterfaceProviderPtr interfaces,
     scoped_refptr<MediaLog> media_log,
     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),
       connection_ref_(std::move(connection_ref)),
       mojo_media_client_(mojo_media_client) {
   DVLOG(1) << __func__;
   DCHECK(mojo_media_client_);
 }
 
 InterfaceFactoryImpl::~InterfaceFactoryImpl() {
   DVLOG(1) << __func__;
 }
 
 // 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)
   scoped_refptr<base::SingleThreadTaskRunner> task_runner(
       base::ThreadTaskRunnerHandle::Get());
 
   std::unique_ptr<AudioDecoder> audio_decoder =
       mojo_media_client_->CreateAudioDecoder(task_runner);
   if (!audio_decoder) {
     LOG(ERROR) << "AudioDecoder creation failed.";
@@ skipping 32 matching lines @@
   auto renderer = renderer_factory->CreateRenderer(
       task_runner, task_runner, audio_sink.get(), video_sink.get(),
       RequestSurfaceCB());
   if (!renderer) {
     LOG(ERROR) << "Renderer creation failed.";
     return;
   }
 
   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());
 
   MojoRendererService* mojo_renderer_service_ptr = mojo_renderer_service.get();
 
   StrongBindingSet<mojom::Renderer>::BindingId binding_id =
       renderer_bindings_.AddBinding(std::move(mojo_renderer_service),
                                     std::move(request));
 
@@ skipping 31 matching lines @@
 #if defined(ENABLE_MOJO_CDM)
 CdmFactory* InterfaceFactoryImpl::GetCdmFactory() {
   if (!cdm_factory_) {
     cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get());
     LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available.";
   }
   return cdm_factory_.get();
 }
 #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