Chromecast: Play audio streams not supported by CMA via default renderer

chromecast/media/base/media_renderer.cc

Index: chromecast/media/base/media_renderer.cc
diff --git a/chromecast/media/base/media_renderer.cc b/chromecast/media/base/media_renderer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a6a3a17f21b019256c38a35ba44d8a09ce5ae82e
--- /dev/null
+++ b/chromecast/media/base/media_renderer.cc
@@ -0,0 +1,101 @@
+// Copyright 2015 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/base/media_renderer.h"
+
+#include "base/logging.h"
+#include "chromecast/media/cma/filters/cma_renderer.h"

[gunsch, 2015/03/03 00:06:40]

chromecast/media/base should NOT be depending on chromecast/media/cma/filters.
Please move this file to chromecast/media/cma/filters. (Android build can link
in chromecast/media/base, but not chromecast/media/cma)

[servolk, 2015/03/03 00:46:53]

Luckily we don't really need CmaRenderer here, we can use media::Renderer
instead.

+#include "media/base/audio_decoder_config.h"
+#include "media/base/demuxer_stream.h"
+#include "media/base/demuxer_stream_provider.h"
+
+namespace chromecast {
+namespace media {
+
+MediaRenderer::MediaRenderer(
+      scoped_ptr<::media::Renderer> default_renderer,

[gunsch, 2015/03/03 00:06:40]

style nit: indentation

[servolk, 2015/03/03 00:46:53]

Done.

+      scoped_ptr<CmaRenderer> cma_renderer)
+    : default_renderer_(default_renderer.Pass()),
+      cma_renderer_(cma_renderer.Pass()) {
+  DCHECK(default_renderer_);
+  DCHECK(cma_renderer_);
+}
+
+MediaRenderer::~MediaRenderer() {
+}
+
+void MediaRenderer::Initialize(
+    ::media::DemuxerStreamProvider* demuxer_stream_provider,
+    const base::Closure& init_cb,
+    const ::media::StatisticsCB& statistics_cb,
+    const ::media::BufferingStateCB& buffering_state_cb,
+    const ::media::Renderer::PaintCB& paint_cb,
+    const base::Closure& ended_cb,
+    const ::media::PipelineStatusCB& error_cb) {
+  // At this point the DemuxerStreamProvider should be fully initialized, so we
+  // have enough information to decide which renderer to use.
+  demuxer_stream_provider_ = demuxer_stream_provider;
+  DCHECK(demuxer_stream_provider_);
+  ::media::DemuxerStream* audio_stream =
+      demuxer_stream_provider_->GetStream(::media::DemuxerStream::AUDIO);
+  ::media::DemuxerStream* video_stream =
+      demuxer_stream_provider_->GetStream(::media::DemuxerStream::VIDEO);
+  if (audio_stream && !video_stream &&
+      audio_stream->audio_decoder_config().codec() != ::media::kCodecAAC &&
+      audio_stream->audio_decoder_config().codec() != ::media::kCodecVorbis) {
+    // We'll use the default Chrome media renderer with software audio decoding
+    cma_renderer_.reset();
+  } else {
+    // We'll use the CMA-based rendering with hardware decoding
+    default_renderer_.reset();
+  }
+
+  return GetRenderer()->Initialize(demuxer_stream_provider,
+                                   init_cb, statistics_cb, buffering_state_cb,
+                                   paint_cb, ended_cb, error_cb);
+}
+
+::media::Renderer* MediaRenderer::GetRenderer() const {
+  DCHECK(default_renderer_ || cma_renderer_);
+  if (cma_renderer_)
+    return cma_renderer_.get();
+
+  DCHECK(default_renderer_);
+  return default_renderer_.get();
+}
+
+void MediaRenderer::SetCdm(::media::CdmContext* cdm_context,
+                           const ::media::CdmAttachedCB& cdm_attached_cb) {
+  GetRenderer()->SetCdm(cdm_context, cdm_attached_cb);
+}
+
+void MediaRenderer::Flush(const base::Closure& flush_cb) {
+  GetRenderer()->Flush(flush_cb);
+}
+
+void MediaRenderer::StartPlayingFrom(base::TimeDelta time) {
+  GetRenderer()->StartPlayingFrom(time);
+}
+
+void MediaRenderer::SetPlaybackRate(float playback_rate)  {
+  GetRenderer()->SetPlaybackRate(playback_rate);
+}
+
+void MediaRenderer::SetVolume(float volume)  {
+  GetRenderer()->SetVolume(volume);
+}

[gunsch, 2015/03/03 00:06:40]

style nit: blank line

[servolk, 2015/03/03 00:46:53]

Done.

+base::TimeDelta MediaRenderer::GetMediaTime()  {
+  return GetRenderer()->GetMediaTime();
+}
+
+bool MediaRenderer::HasAudio() {
+  return GetRenderer()->HasAudio();
+}
+
+bool MediaRenderer::HasVideo() {
+  return GetRenderer()->HasVideo();
+}
+
+}  // namespace media
+}  // namespace chromecast