MediaResource refactoring to support multiple streams

media/remoting/remote_renderer_impl.cc

Index: media/remoting/remote_renderer_impl.cc
diff --git a/media/remoting/remote_renderer_impl.cc b/media/remoting/remote_renderer_impl.cc
index 07103c4d2212c612d923c58fd69f9900cea334c9..06b4ad436e65a3619f1c4390d238ededb449bf2b 100644
--- a/media/remoting/remote_renderer_impl.cc
+++ b/media/remoting/remote_renderer_impl.cc
@@ -17,7 +17,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "media/base/bind_to_current_loop.h"
-#include "media/base/demuxer_stream_provider.h"
+#include "media/base/media_resource.h"
 #include "media/remoting/remote_demuxer_stream_adapter.h"
 #include "media/remoting/remoting_renderer_controller.h"
 #include "media/remoting/rpc/proto_enum_utils.h"
@@ -62,7 +62,7 @@ RemoteRendererImpl::RemoteRendererImpl(
     : state_(STATE_UNINITIALIZED),
       main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       media_task_runner_(std::move(media_task_runner)),
-      demuxer_stream_provider_(nullptr),
+      media_resource_(nullptr),
       client_(nullptr),
       remoting_renderer_controller_(remoting_renderer_controller),
       rpc_broker_(remoting_renderer_controller_->GetRpcBroker()),
@@ -104,13 +104,12 @@ RemoteRendererImpl::~RemoteRendererImpl() {
                  rpc_broker_, rpc_handle_));
 }
 
-void RemoteRendererImpl::Initialize(
-    DemuxerStreamProvider* demuxer_stream_provider,
-    media::RendererClient* client,
-    const PipelineStatusCB& init_cb) {
+void RemoteRendererImpl::Initialize(MediaResource* media_resource,
+                                    media::RendererClient* client,
+                                    const PipelineStatusCB& init_cb) {
   VLOG(2) << __func__;
   DCHECK(media_task_runner_->BelongsToCurrentThread());
-  DCHECK(demuxer_stream_provider);
+  DCHECK(media_resource);
   DCHECK(client);
 
   if (state_ != STATE_UNINITIALIZED) {
@@ -119,22 +118,31 @@ void RemoteRendererImpl::Initialize(
     return;
   }
 
-  demuxer_stream_provider_ = demuxer_stream_provider;
+  media_resource_ = media_resource;
   client_ = client;
   init_workflow_done_callback_ = init_cb;
 
   state_ = STATE_CREATE_PIPE;
+
+  std::vector<::media::DemuxerStream*> streams = media_resource_->GetStreams();
+  ::media::DemuxerStream* audio_demuxer_stream = nullptr;
+  ::media::DemuxerStream* video_demuxer_stream = nullptr;
+  for (const auto& s : streams) {
+    if (s->type() == DemuxerStream::AUDIO && s->enabled() &&
+        !audio_demuxer_stream)
+      audio_demuxer_stream = s;
+    if (s->type() == DemuxerStream::VIDEO && s->enabled() &&
+        !video_demuxer_stream)
+      video_demuxer_stream = s;
+  }
+
   // Create audio mojo data pipe handles if audio is available.
-  ::media::DemuxerStream* audio_demuxer_stream =
-      demuxer_stream_provider_->GetStream(::media::DemuxerStream::AUDIO);
   std::unique_ptr<mojo::DataPipe> audio_data_pipe;
   if (audio_demuxer_stream) {
     audio_data_pipe = base::WrapUnique(remoting::CreateDataPipe());
   }
 
   // Create video mojo data pipe handles if video is available.
-  ::media::DemuxerStream* video_demuxer_stream =
-      demuxer_stream_provider_->GetStream(::media::DemuxerStream::VIDEO);
   std::unique_ptr<mojo::DataPipe> video_data_pipe;
   if (video_demuxer_stream) {
     video_data_pipe = base::WrapUnique(remoting::CreateDataPipe());
@@ -325,9 +333,20 @@ void RemoteRendererImpl::OnDataPipeCreated(
     return;  // Abort because something went wrong in the meantime.
   DCHECK_EQ(state_, STATE_CREATE_PIPE);
 
+  // TODO(erickung): Make remote renderer multi-stream capable.
+  std::vector<::media::DemuxerStream*> streams = media_resource_->GetStreams();
+  ::media::DemuxerStream* audio_demuxer_stream = nullptr;
+  ::media::DemuxerStream* video_demuxer_stream = nullptr;
+  for (const auto& s : streams) {
+    if (s->type() == DemuxerStream::AUDIO && s->enabled() &&
+        !audio_demuxer_stream)
+      audio_demuxer_stream = s;
+    if (s->type() == DemuxerStream::VIDEO && s->enabled() &&
+        !video_demuxer_stream)
+      video_demuxer_stream = s;
+  }
+
   // Create audio demuxer stream adapter if audio is available.
-  ::media::DemuxerStream* audio_demuxer_stream =
-      demuxer_stream_provider_->GetStream(::media::DemuxerStream::AUDIO);
   if (audio_demuxer_stream && audio.is_valid() && audio_handle.is_valid() &&
       audio_rpc_handle != remoting::kInvalidHandle) {
     VLOG(2) << "Initialize audio";
@@ -341,8 +360,6 @@ void RemoteRendererImpl::OnDataPipeCreated(
   }
 
   // Create video demuxer stream adapter if video is available.
-  ::media::DemuxerStream* video_demuxer_stream =
-      demuxer_stream_provider_->GetStream(::media::DemuxerStream::VIDEO);
   if (video_demuxer_stream && video.is_valid() && video_handle.is_valid() &&
       video_rpc_handle != remoting::kInvalidHandle) {
     VLOG(2) << "Initialize video";