Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1392)

Unified Diff: media/mojo/services/mojo_renderer_impl.cc

Issue 684963003: Add support for external video renderers in mojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo_config
Patch Set: More MSVC... Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/mojo_demuxer_stream_impl.cc ('k') | media/mojo/services/mojo_renderer_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_renderer_impl.cc
diff --git a/media/mojo/services/mojo_renderer_impl.cc b/media/mojo/services/mojo_renderer_impl.cc
index 48d28e04e7ade69044d67ca62467f9b8ee6bd935..9ed903f0a31e40ea4fffc01cad5a26605888ed05 100644
--- a/media/mojo/services/mojo_renderer_impl.cc
+++ b/media/mojo/services/mojo_renderer_impl.cc
@@ -53,14 +53,24 @@ void MojoRendererImpl::Initialize(
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())));
}
@@ -105,13 +115,13 @@ 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) {
« no previous file with comments | « media/mojo/services/mojo_demuxer_stream_impl.cc ('k') | media/mojo/services/mojo_renderer_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698