Add support for external video renderers in mojo.

media/mojo/services/mojo_renderer_impl.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/services/mojo_renderer_impl.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 35 matching lines @@
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(demuxer_stream_provider);
 
   demuxer_stream_provider_ = demuxer_stream_provider;
   // |init_cb| can be called on other thread.
   init_cb_ = init_cb;
   ended_cb_ = ended_cb;
   error_cb_ = error_cb;
   buffering_state_cb_ = buffering_state_cb;
 
-  // Create a mojo::DemuxerStream and bind its lifetime to the pipe.
-  mojo::DemuxerStreamPtr demuxer_stream;
-  mojo::BindToProxy(
-      new MojoDemuxerStreamImpl(
-          demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO)),
-      &demuxer_stream);
+  // Create audio and video mojo::DemuxerStream and bind its lifetime to the
+  // pipe.
+  DemuxerStream* const audio =
+      demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO);
+  DemuxerStream* const video =
+      demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO);
+
+  mojo::DemuxerStreamPtr audio_stream;
+  if (audio)
+    mojo::BindToProxy(new MojoDemuxerStreamImpl(audio), &audio_stream);
+
+  mojo::DemuxerStreamPtr video_stream;
+  if (video)
+    mojo::BindToProxy(new MojoDemuxerStreamImpl(video), &video_stream);
+
   remote_audio_renderer_->Initialize(
-      demuxer_stream.Pass(),
+      audio_stream.Pass(),
+      video_stream.Pass(),
       BindToCurrentLoop(base::Bind(&MojoRendererImpl::OnInitialized,
                                    weak_factory_.GetWeakPtr())));
 }
 
 void MojoRendererImpl::Flush(const base::Closure& flush_cb) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   remote_audio_renderer_->Flush(flush_cb);
 }
 
@@ skipping 24 matching lines @@
 base::TimeDelta MojoRendererImpl::GetMediaTime() {
   base::AutoLock auto_lock(lock_);
   DVLOG(3) << __FUNCTION__ << ": " << time_.InMilliseconds() << " ms";
   return time_;
 }
 
 bool MojoRendererImpl::HasAudio() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(remote_audio_renderer_.get());  // We always bind the renderer.
-  return true;
+  return !!demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO);
 }
 
 bool MojoRendererImpl::HasVideo() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
-  return false;
+  return !!demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO);
 }
 
 void MojoRendererImpl::SetCdm(MediaKeys* cdm) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   NOTIMPLEMENTED();
 }
 
 void MojoRendererImpl::OnTimeUpdate(int64_t time_usec, int64_t max_time_usec) {
   DVLOG(3) << __FUNCTION__ << ": " << time_usec << ", " << max_time_usec;
@@ skipping 59 matching lines @@
 
 void MojoRendererImpl::OnInitialized() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!init_cb_.is_null());
 
   base::ResetAndReturn(&init_cb_).Run();
 }
 
 }  // namespace media