MediaResource refactoring to support multiple streams

media/mojo/clients/mojo_renderer.cc

 // Copyright 2014 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/clients/mojo_renderer.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
-#include "media/base/demuxer_stream_provider.h"
+#include "media/base/media_resource.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/renderer_client.h"
 #include "media/base/video_renderer_sink.h"
 #include "media/mojo/clients/mojo_demuxer_stream_impl.h"
 #include "media/renderers/video_overlay_factory.h"
 
 namespace media {
 
 MojoRenderer::MojoRenderer(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     std::unique_ptr<VideoOverlayFactory> video_overlay_factory,
     VideoRendererSink* video_renderer_sink,
     mojom::RendererPtr remote_renderer)
     : task_runner_(task_runner),
       video_overlay_factory_(std::move(video_overlay_factory)),
       video_renderer_sink_(video_renderer_sink),
       remote_renderer_info_(remote_renderer.PassInterface()),
       client_binding_(this),
       media_time_interpolator_(&media_clock_) {
   DVLOG(1) << __func__;
 }
 
 MojoRenderer::~MojoRenderer() {
   DVLOG(1) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   CancelPendingCallbacks();
 }
 
-void MojoRenderer::Initialize(DemuxerStreamProvider* demuxer_stream_provider,
+void MojoRenderer::Initialize(MediaResource* media_resource,
                               media::RendererClient* client,
                               const PipelineStatusCB& init_cb) {
   DVLOG(1) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
-  DCHECK(demuxer_stream_provider);
+  DCHECK(media_resource);
 
   if (encountered_error_) {
     task_runner_->PostTask(
         FROM_HERE, base::Bind(init_cb, PIPELINE_ERROR_INITIALIZATION_FAILED));
     return;
   }
 
-  demuxer_stream_provider_ = demuxer_stream_provider;
+  media_resource_ = media_resource;
   init_cb_ = init_cb;
 
-  switch (demuxer_stream_provider_->GetType()) {
-    case DemuxerStreamProvider::Type::STREAM:
+  switch (media_resource_->GetType()) {
+    case MediaResource::Type::STREAM:
       InitializeRendererFromStreams(client);
       break;
-    case DemuxerStreamProvider::Type::URL:
+    case MediaResource::Type::URL:
       InitializeRendererFromUrl(client);
       break;
   }
 }
 
 void MojoRenderer::InitializeRendererFromStreams(
     media::RendererClient* client) {
   DVLOG(1) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
-  // Create audio and video mojom::DemuxerStream and bind its lifetime to
-  // the pipe.
-  DemuxerStream* const audio =
-      demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO);
-  DemuxerStream* const video =
-      demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO);
+  // Create mojom::DemuxerStream for each demuxer stream and bind its lifetime
+  // to the pipe.
+  std::vector<DemuxerStream*> streams = media_resource_->GetStreams();
+  std::vector<mojom::DemuxerStreamPtr> stream_proxies;
 
-  std::vector<mojom::DemuxerStreamPtr> streams;
-  if (audio) {
-    mojom::DemuxerStreamPtr audio_stream;
+  for (const auto& s : streams) {
+    mojom::DemuxerStreamPtr stream_proxy;
     std::unique_ptr<MojoDemuxerStreamImpl> mojo_stream =
-        base::MakeUnique<MojoDemuxerStreamImpl>(audio,
-                                                MakeRequest(&audio_stream));
+        base::MakeUnique<MojoDemuxerStreamImpl>(s, MakeRequest(&stream_proxy));
+
     // Using base::Unretained(this) is safe because |this| owns |mojo_stream|,
     // and the error handler can't be invoked once |mojo_stream| is destroyed.
     mojo_stream->set_connection_error_handler(
         base::Bind(&MojoRenderer::OnDemuxerStreamConnectionError,
                    base::Unretained(this), mojo_stream.get()));
+
+    stream_proxies.push_back(std::move(stream_proxy));
     streams_.push_back(std::move(mojo_stream));
-    streams.push_back(std::move(audio_stream));
-  }
-
-  if (video) {
-    mojom::DemuxerStreamPtr video_stream;
-    std::unique_ptr<MojoDemuxerStreamImpl> mojo_stream =
-        base::MakeUnique<MojoDemuxerStreamImpl>(video,
-                                                MakeRequest(&video_stream));
-    // Using base::Unretained(this) is safe because |this| owns |mojo_stream|,
-    // and the error handler can't be invoked once |mojo_stream| is destroyed.
-    mojo_stream->set_connection_error_handler(
-        base::Bind(&MojoRenderer::OnDemuxerStreamConnectionError,
-                   base::Unretained(this), mojo_stream.get()));
-    streams_.push_back(std::move(mojo_stream));
-    streams.push_back(std::move(video_stream));
   }
 
   BindRemoteRendererIfNeeded();
 
   mojom::RendererClientAssociatedPtrInfo client_ptr_info;
   client_binding_.Bind(&client_ptr_info, remote_renderer_.associated_group());
 
   // Using base::Unretained(this) is safe because |this| owns
   // |remote_renderer_|, and the callback won't be dispatched if
   // |remote_renderer_| is destroyed.
   remote_renderer_->Initialize(
-      std::move(client_ptr_info), std::move(streams), base::nullopt,
+      std::move(client_ptr_info), std::move(stream_proxies), base::nullopt,
       base::nullopt,
       base::Bind(&MojoRenderer::OnInitialized, base::Unretained(this), client));
 }
 
 void MojoRenderer::InitializeRendererFromUrl(media::RendererClient* client) {
   DVLOG(2) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   BindRemoteRendererIfNeeded();
 
   mojom::RendererClientAssociatedPtrInfo client_ptr_info;
   client_binding_.Bind(&client_ptr_info, remote_renderer_.associated_group());
 
-  MediaUrlParams url_params = demuxer_stream_provider_->GetMediaUrlParams();
+  MediaUrlParams url_params = media_resource_->GetMediaUrlParams();
 
   // Using base::Unretained(this) is safe because |this| owns
   // |remote_renderer_|, and the callback won't be dispatched if
   // |remote_renderer_| is destroyed.
   std::vector<mojom::DemuxerStreamPtr> streams;
   remote_renderer_->Initialize(
       std::move(client_ptr_info), std::move(streams), url_params.media_url,
       url_params.first_party_for_cookies,
       base::Bind(&MojoRenderer::OnInitialized, base::Unretained(this), client));
 }
@@ skipping 249 matching lines @@
     base::ResetAndReturn(&init_cb_).Run(PIPELINE_ERROR_INITIALIZATION_FAILED);
 
   if (!flush_cb_.is_null())
     base::ResetAndReturn(&flush_cb_).Run();
 
   if (!cdm_attached_cb_.is_null())
     base::ResetAndReturn(&cdm_attached_cb_).Run(false);
 }
 
 }  // namespace media