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 f93bfe1a8dbf4d28116d3b3d51f734b4b05bf6b6..b067f142f7ed321ceaafeebc4d345d5d63f8c7e8 100644 |
--- a/media/mojo/services/mojo_renderer_impl.cc |
+++ b/media/mojo/services/mojo_renderer_impl.cc |
@@ -19,20 +19,19 @@ namespace media { |
MojoRendererImpl::MojoRendererImpl( |
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
- mojo::ServiceProvider* audio_renderer_provider) |
+ mojo::ServiceProvider* media_renderer_provider) |
: task_runner_(task_runner), |
weak_factory_(this) { |
DVLOG(1) << __FUNCTION__; |
- // For now we only support audio and there must be a provider. |
- DCHECK(audio_renderer_provider); |
- mojo::ConnectToService(audio_renderer_provider, &remote_audio_renderer_); |
- remote_audio_renderer_.set_client(this); |
+ DCHECK(media_renderer_provider); |
+ mojo::ConnectToService(media_renderer_provider, &remote_media_renderer_); |
+ remote_media_renderer_.set_client(this); |
} |
MojoRendererImpl::~MojoRendererImpl() { |
DVLOG(1) << __FUNCTION__; |
DCHECK(task_runner_->BelongsToCurrentThread()); |
- // Connection to |remote_audio_renderer_| will error-out here. |
+ // Connection to |remote_media_renderer_| will error-out here. |
} |
// TODO(xhwang): Support |paint_cb| if needed. |
@@ -70,7 +69,7 @@ void MojoRendererImpl::Initialize( |
if (video) |
mojo::BindToProxy(new MojoDemuxerStreamImpl(video), &video_stream); |
- remote_audio_renderer_->Initialize( |
+ remote_media_renderer_->Initialize( |
audio_stream.Pass(), |
video_stream.Pass(), |
BindToCurrentLoop(base::Bind(&MojoRendererImpl::OnInitialized, |
@@ -80,7 +79,7 @@ void MojoRendererImpl::Initialize( |
void MojoRendererImpl::Flush(const base::Closure& flush_cb) { |
DVLOG(2) << __FUNCTION__; |
DCHECK(task_runner_->BelongsToCurrentThread()); |
- remote_audio_renderer_->Flush(flush_cb); |
+ remote_media_renderer_->Flush(flush_cb); |
} |
void MojoRendererImpl::StartPlayingFrom(base::TimeDelta time) { |
@@ -92,19 +91,19 @@ void MojoRendererImpl::StartPlayingFrom(base::TimeDelta time) { |
time_ = time; |
} |
- remote_audio_renderer_->StartPlayingFrom(time.InMicroseconds()); |
+ remote_media_renderer_->StartPlayingFrom(time.InMicroseconds()); |
} |
void MojoRendererImpl::SetPlaybackRate(float playback_rate) { |
DVLOG(2) << __FUNCTION__; |
DCHECK(task_runner_->BelongsToCurrentThread()); |
- remote_audio_renderer_->SetPlaybackRate(playback_rate); |
+ remote_media_renderer_->SetPlaybackRate(playback_rate); |
} |
void MojoRendererImpl::SetVolume(float volume) { |
DVLOG(2) << __FUNCTION__; |
DCHECK(task_runner_->BelongsToCurrentThread()); |
- remote_audio_renderer_->SetVolume(volume); |
+ remote_media_renderer_->SetVolume(volume); |
} |
base::TimeDelta MojoRendererImpl::GetMediaTime() { |
@@ -116,7 +115,7 @@ base::TimeDelta MojoRendererImpl::GetMediaTime() { |
bool MojoRendererImpl::HasAudio() { |
DVLOG(1) << __FUNCTION__; |
DCHECK(task_runner_->BelongsToCurrentThread()); |
- DCHECK(remote_audio_renderer_.get()); // We always bind the renderer. |
+ DCHECK(remote_media_renderer_.get()); // We always bind the renderer. |
return !!demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO); |
} |