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"
@@ skipping 53 matching lines @@
       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 = media_resource_->GetStream(DemuxerStream::AUDIO);
-  DemuxerStream* const video = media_resource_->GetStream(DemuxerStream::VIDEO);
+  // Create mojom::DemuxerStream for each demuxer stream and bind its lifetime
+  // to the pipe.
+  std::vector<DemuxerStream*> streams = media_resource_->GetAllStreams();
+  std::vector<mojom::DemuxerStreamPtr> stream_proxies;
 
-  std::vector<mojom::DemuxerStreamPtr> streams;
-  if (audio) {
-    mojom::DemuxerStreamPtr audio_stream;
+  for (const auto& stream : streams) {
+    mojom::DemuxerStreamPtr stream_proxy;
     std::unique_ptr<MojoDemuxerStreamImpl> mojo_stream =
-        base::MakeUnique<MojoDemuxerStreamImpl>(audio,
-                                                MakeRequest(&audio_stream));
+        base::MakeUnique<MojoDemuxerStreamImpl>(stream,
+                                                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()));
+
     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));
+    stream_proxies.push_back(std::move(stream_proxy));
   }
 
   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();
 
@@ skipping 263 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