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

content/renderer/media/media_interface_provider.cc

 // Copyright 2016 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/media/media_interface_provider.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
+#include "media/mojo/interfaces/demuxer.mojom.h"
 #include "media/mojo/interfaces/renderer.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 
 namespace content {
 
 MediaInterfaceProvider::MediaInterfaceProvider(
     service_manager::InterfaceProvider* remote_interfaces)
     : remote_interfaces_(remote_interfaces) {}
 
@@ skipping 13 matching lines @@
   } else if (interface_name == media::mojom::Renderer::Name_) {
     GetMediaInterfaceFactory()->CreateRenderer(
         std::string(),
         mojo::MakeRequest<media::mojom::Renderer>(std::move(pipe)));
   } else if (interface_name == media::mojom::AudioDecoder::Name_) {
     GetMediaInterfaceFactory()->CreateAudioDecoder(
         mojo::MakeRequest<media::mojom::AudioDecoder>(std::move(pipe)));
   } else if (interface_name == media::mojom::VideoDecoder::Name_) {
     GetMediaInterfaceFactory()->CreateVideoDecoder(
         mojo::MakeRequest<media::mojom::VideoDecoder>(std::move(pipe)));
+  } else if (interface_name == media::mojom::Demuxer::Name_) {
+    GetMediaInterfaceFactory()->CreateDemuxer(
+        mojo::MakeRequest<media::mojom::Demuxer>(std::move(pipe)));
+  } else if (interface_name == media::mojom::SourceBuffer::Name_) {
+    GetMediaInterfaceFactory()->CreateSourceBuffer(
+        mojo::MakeRequest<media::mojom::SourceBuffer>(std::move(pipe)));
   } else {
     NOTREACHED();
   }
 }
 
 media::mojom::InterfaceFactory*
 MediaInterfaceProvider::GetMediaInterfaceFactory() {
   DVLOG(1) << __func__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!media_interface_factory_) {
     remote_interfaces_->GetInterface(&media_interface_factory_);
     media_interface_factory_.set_connection_error_handler(base::Bind(
         &MediaInterfaceProvider::OnConnectionError, base::Unretained(this)));
   }
 
   return media_interface_factory_.get();
 }
 
 void MediaInterfaceProvider::OnConnectionError() {
   DVLOG(1) << __func__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
   media_interface_factory_.reset();
 }
 
 }  // namespace content