MediaResource refactoring to support multiple streams

chromecast/media/service/cast_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 "chromecast/media/service/cast_renderer.h"
 
 #include "base/bind.h"
 #include "base/single_thread_task_runner.h"
 #include "chromecast/base/task_runner_impl.h"
 #include "chromecast/media/base/video_resolution_policy.h"
 #include "chromecast/media/cdm/cast_cdm_context.h"
 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h"
 #include "chromecast/media/cma/base/cma_logging.h"
 #include "chromecast/media/cma/base/demuxer_stream_adapter.h"
 #include "chromecast/media/cma/pipeline/media_pipeline_impl.h"
 #include "chromecast/media/cma/pipeline/video_pipeline_client.h"
 #include "chromecast/public/media/media_pipeline_backend.h"
 #include "chromecast/public/media/media_pipeline_device_params.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/demuxer_stream.h"
-#include "media/base/demuxer_stream_provider.h"
 #include "media/base/media_log.h"
+#include "media/base/media_resource.h"
 #include "media/base/renderer_client.h"
 
 namespace chromecast {
 namespace media {
 
 namespace {
 // Maximum difference between audio frame PTS and video frame PTS
 // for frames read from the DemuxerStream.
 const base::TimeDelta kMaxDeltaFetcher(base::TimeDelta::FromMilliseconds(2000));
 }  // namespace
@@ skipping 21 matching lines @@
 }
 
 CastRenderer::~CastRenderer() {
   CMALOG(kLogControl) << __FUNCTION__ << ": " << this;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (video_resolution_policy_)
     video_resolution_policy_->RemoveObserver(this);
 }
 
-void CastRenderer::Initialize(
-    ::media::DemuxerStreamProvider* demuxer_stream_provider,
-    ::media::RendererClient* client,
-    const ::media::PipelineStatusCB& init_cb) {
+void CastRenderer::Initialize(::media::MediaResource* media_resource,
+                              ::media::RendererClient* client,
+                              const ::media::PipelineStatusCB& init_cb) {
   CMALOG(kLogControl) << __FUNCTION__ << ": " << this;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // Create pipeline backend.
   media_resource_usage_.reset(
       new MediaResourceTracker::ScopedUsage(media_resource_tracker_));
   backend_task_runner_.reset(new TaskRunnerImpl());
   // TODO(erickung): crbug.com/443956. Need to provide right LoadType.
   LoadType load_type = kLoadTypeMediaSource;
   MediaPipelineDeviceParams::MediaSyncType sync_type =
       (load_type == kLoadTypeMediaStream)
           ? MediaPipelineDeviceParams::kModeIgnorePts
           : MediaPipelineDeviceParams::kModeSyncPts;
   MediaPipelineDeviceParams params(sync_type, backend_task_runner_.get());
   std::unique_ptr<MediaPipelineBackend> backend =
       create_backend_cb_.Run(params, audio_device_id_);
 
   // Create pipeline.
   MediaPipelineClient pipeline_client;
   pipeline_client.error_cb =
       base::Bind(&CastRenderer::OnError, weak_factory_.GetWeakPtr());
   pipeline_client.buffering_state_cb = base::Bind(
       &CastRenderer::OnBufferingStateChange, weak_factory_.GetWeakPtr());
   pipeline_.reset(new MediaPipelineImpl());
   pipeline_->SetClient(pipeline_client);
   pipeline_->Initialize(load_type, std::move(backend));
 
+  // Obtain the first enabled audio and video streams.

[xhwang, 2017/02/01 18:26:03]

Here and everywhere else, add a TODO to enable multiple streams.

[servolk, 2017/02/01 22:29:11]

Done.

+  std::vector<::media::DemuxerStream*> streams = media_resource->GetStreams();
+  ::media::DemuxerStream* audio_stream = nullptr;
+  ::media::DemuxerStream* video_stream = nullptr;
+  for (const auto& s : streams) {

[xhwang, 2017/02/01 18:26:03]

tiny nit: This is a local variable in the loop so it won't cause any issue. But
in general we are still against abbreviation names:

https://google.github.io/styleguide/cppguide.html#General_Naming_Rules

s/s/stream/?

[servolk, 2017/02/01 22:29:11]

Done.

+    if (!audio_stream && s->enabled() &&
+        s->type() == ::media::DemuxerStream::AUDIO) {
+      audio_stream = s;
+    }
+    if (!video_stream && s->enabled() &&
+        s->type() == ::media::DemuxerStream::VIDEO) {
+      video_stream = s;
+    }
+  }
+
   // Initialize audio.
-  ::media::DemuxerStream* audio_stream =
-      demuxer_stream_provider->GetStream(::media::DemuxerStream::AUDIO);
   if (audio_stream) {
     AvPipelineClient audio_client;
     audio_client.wait_for_key_cb = base::Bind(
         &CastRenderer::OnWaitingForDecryptionKey, weak_factory_.GetWeakPtr());
     audio_client.eos_cb = base::Bind(&CastRenderer::OnEnded,
                                      weak_factory_.GetWeakPtr(), STREAM_AUDIO);
     audio_client.playback_error_cb =
         base::Bind(&CastRenderer::OnError, weak_factory_.GetWeakPtr());
     audio_client.statistics_cb = base::Bind(&CastRenderer::OnStatisticsUpdate,
                                             weak_factory_.GetWeakPtr());
     std::unique_ptr<CodedFrameProvider> frame_provider(new DemuxerStreamAdapter(
         task_runner_, media_task_runner_factory_, audio_stream));
 
     ::media::PipelineStatus status =
         pipeline_->InitializeAudio(audio_stream->audio_decoder_config(),
                                    audio_client, std::move(frame_provider));
     if (status != ::media::PIPELINE_OK) {
       init_cb.Run(status);
       return;
     }
     audio_stream->EnableBitstreamConverter();
   }
 
   // Initialize video.
-  ::media::DemuxerStream* video_stream =
-      demuxer_stream_provider->GetStream(::media::DemuxerStream::VIDEO);
   if (video_stream) {
     VideoPipelineClient video_client;
     video_client.av_pipeline_client.wait_for_key_cb = base::Bind(
         &CastRenderer::OnWaitingForDecryptionKey, weak_factory_.GetWeakPtr());
     video_client.av_pipeline_client.eos_cb = base::Bind(
         &CastRenderer::OnEnded, weak_factory_.GetWeakPtr(), STREAM_VIDEO);
     video_client.av_pipeline_client.playback_error_cb =
         base::Bind(&CastRenderer::OnError, weak_factory_.GetWeakPtr());
     video_client.av_pipeline_client.statistics_cb = base::Bind(
         &CastRenderer::OnStatisticsUpdate, weak_factory_.GetWeakPtr());
@@ skipping 124 matching lines @@
 }
 
 void CastRenderer::OnVideoOpacityChange(bool opaque) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(opaque);
   client_->OnVideoOpacityChange(opaque);
 }
 
 }  // namespace media
 }  // namespace chromecast