MediaResource refactoring to support multiple streams

media/remoting/courier_renderer.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 "media/remoting/courier_renderer.h"
 
 #include <algorithm>
 #include <limits>
 #include <utility>
 
@@ skipping 106 matching lines @@
         FROM_HERE, base::Bind(init_cb, PIPELINE_ERROR_INVALID_STATE));
     return;
   }
 
   media_resource_ = media_resource;
   client_ = client;
   init_workflow_done_callback_ = init_cb;
 
   state_ = STATE_CREATE_PIPE;
 
+  // TODO(servolk): Add support for multiple streams. For now use the first
+  // enabled audio and video streams to preserve the existing behavior.
+  ::media::DemuxerStream* audio_demuxer_stream =
+      media_resource_->GetFirstStream(DemuxerStream::AUDIO);
+  ::media::DemuxerStream* video_demuxer_stream =
+      media_resource_->GetFirstStream(DemuxerStream::VIDEO);
+
   // Create audio mojo data pipe handles if audio is available.
-  DemuxerStream* audio_demuxer_stream =
-      media_resource_->GetStream(DemuxerStream::AUDIO);
   std::unique_ptr<mojo::DataPipe> audio_data_pipe;
   if (audio_demuxer_stream) {
     audio_data_pipe = base::WrapUnique(DemuxerStreamAdapter::CreateDataPipe());
   }
 
   // Create video mojo data pipe handles if video is available.
-  DemuxerStream* video_demuxer_stream =
-      media_resource_->GetStream(DemuxerStream::VIDEO);
   std::unique_ptr<mojo::DataPipe> video_data_pipe;
   if (video_demuxer_stream) {
     video_data_pipe = base::WrapUnique(DemuxerStreamAdapter::CreateDataPipe());
   }
 
   // Establish remoting data pipe connection using main thread.
   const SharedSession::DataPipeStartCallback data_pipe_callback =
       base::Bind(&CourierRenderer::OnDataPipeCreatedOnMainThread,
                  media_task_runner_, weak_factory_.GetWeakPtr(), rpc_broker_);
   main_task_runner_->PostTask(
@@ skipping 169 matching lines @@
     int audio_rpc_handle,
     int video_rpc_handle) {
   VLOG(2) << __func__;
   DCHECK(media_task_runner_->BelongsToCurrentThread());
 
   if (state_ == STATE_ERROR)
     return;  // Abort because something went wrong in the meantime.
   DCHECK_EQ(state_, STATE_CREATE_PIPE);
   DCHECK(!init_workflow_done_callback_.is_null());
 
+  // TODO(servolk): Add support for multiple streams. For now use the first
+  // enabled audio and video streams to preserve the existing behavior.
+  ::media::DemuxerStream* audio_demuxer_stream =
+      media_resource_->GetFirstStream(DemuxerStream::AUDIO);
+  ::media::DemuxerStream* video_demuxer_stream =
+      media_resource_->GetFirstStream(DemuxerStream::VIDEO);
+
   // Create audio demuxer stream adapter if audio is available.
-  DemuxerStream* audio_demuxer_stream =
-      media_resource_->GetStream(DemuxerStream::AUDIO);
   if (audio_demuxer_stream && audio.is_valid() && audio_handle.is_valid() &&
       audio_rpc_handle != RpcBroker::kInvalidHandle) {
     VLOG(2) << "Initialize audio";
     audio_demuxer_stream_adapter_.reset(new DemuxerStreamAdapter(
         main_task_runner_, media_task_runner_, "audio", audio_demuxer_stream,
         rpc_broker_, audio_rpc_handle, std::move(audio),
         std::move(audio_handle),
         base::Bind(&CourierRenderer::OnFatalError, base::Unretained(this))));
   }
 
   // Create video demuxer stream adapter if video is available.
-  DemuxerStream* video_demuxer_stream =
-      media_resource_->GetStream(DemuxerStream::VIDEO);
   if (video_demuxer_stream && video.is_valid() && video_handle.is_valid() &&
       video_rpc_handle != RpcBroker::kInvalidHandle) {
     VLOG(2) << "Initialize video";
     video_demuxer_stream_adapter_.reset(new DemuxerStreamAdapter(
         main_task_runner_, media_task_runner_, "video", video_demuxer_stream,
         rpc_broker_, video_rpc_handle, std::move(video),
         std::move(video_handle),
         base::Bind(&CourierRenderer::OnFatalError, base::Unretained(this))));
   }
 
@@ skipping 492 matching lines @@
         kBytesPerKilobit;
     DCHECK_GE(kilobits_per_second, 0);
     const base::CheckedNumeric<int> checked_kbps = kilobits_per_second;
     metrics_recorder_.OnVideoRateEstimate(
         checked_kbps.ValueOrDefault(std::numeric_limits<int>::max()));
   }
 }
 
 }  // namespace remoting
 }  // namespace media