diff options
| author | jrummell <jrummell@chromium.org> | 2015-03-02 14:48:27 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-02 22:49:21 +0000 |
| commit | 74fc4f9447f3ea2e277350dccce4de67e5ee4ea4 (patch) | |
| tree | 5421eca29629684887a485bac69460fc6cbd5032 /media/mojo | |
| parent | e86e411c3038fd5be67438da29f0ff17828f226f (diff) | |
| download | chromium_src-74fc4f9447f3ea2e277350dccce4de67e5ee4ea4.zip chromium_src-74fc4f9447f3ea2e277350dccce4de67e5ee4ea4.tar.gz chromium_src-74fc4f9447f3ea2e277350dccce4de67e5ee4ea4.tar.bz2 | |
Decryptors can report kNoKey to WebMediaPlayer
Add callback so that kNoKey can get passed to blink in order
to generate the HTMLMediaElement.waitingforkey event.
BUG=337975
TEST=updated tests pass
Review URL: https://codereview.chromium.org/935243002
Cr-Commit-Position: refs/heads/master@{#318787}
Diffstat (limited to 'media/mojo')
| -rw-r--r-- | media/mojo/services/mojo_renderer_impl.cc | 6 | ||||
| -rw-r--r-- | media/mojo/services/mojo_renderer_impl.h | 3 | ||||
| -rw-r--r-- | media/mojo/services/mojo_renderer_service.cc | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/media/mojo/services/mojo_renderer_impl.cc b/media/mojo/services/mojo_renderer_impl.cc index 3bde3b2..e4a1332 100644 --- a/media/mojo/services/mojo_renderer_impl.cc +++ b/media/mojo/services/mojo_renderer_impl.cc @@ -33,7 +33,8 @@ MojoRendererImpl::~MojoRendererImpl() { // Connection to |remote_media_renderer_| will error-out here. } -// TODO(xhwang): Support |paint_cb| if needed. +// TODO(xhwang): Support |paint_cb| and |waiting_for_decryption_key_cb|, +// if needed. void MojoRendererImpl::Initialize( DemuxerStreamProvider* demuxer_stream_provider, const PipelineStatusCB& init_cb, @@ -41,7 +42,8 @@ void MojoRendererImpl::Initialize( const BufferingStateCB& buffering_state_cb, const PaintCB& /* paint_cb */, const base::Closure& ended_cb, - const PipelineStatusCB& error_cb) { + const PipelineStatusCB& error_cb, + const base::Closure& /* waiting_for_decryption_key_cb */) { DVLOG(1) << __FUNCTION__; DCHECK(task_runner_->BelongsToCurrentThread()); DCHECK(demuxer_stream_provider); diff --git a/media/mojo/services/mojo_renderer_impl.h b/media/mojo/services/mojo_renderer_impl.h index d1ddc31..338bcb8 100644 --- a/media/mojo/services/mojo_renderer_impl.h +++ b/media/mojo/services/mojo_renderer_impl.h @@ -39,7 +39,8 @@ class MojoRendererImpl : public Renderer, public mojo::MediaRendererClient { const BufferingStateCB& buffering_state_cb, const PaintCB& paint_cb, const base::Closure& ended_cb, - const PipelineStatusCB& error_cb) override; + const PipelineStatusCB& error_cb, + const base::Closure& waiting_for_decryption_key_cb) override; void SetCdm(CdmContext* cdm_context, const CdmAttachedCB& cdm_attached_cb) override; void Flush(const base::Closure& flush_cb) override; diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc index a737aa3..d4d2c9a 100644 --- a/media/mojo/services/mojo_renderer_service.cc +++ b/media/mojo/services/mojo_renderer_service.cc @@ -120,7 +120,8 @@ void MojoRendererService::OnStreamReady(const mojo::Closure& callback) { base::Bind(&MojoRendererService::OnBufferingStateChanged, weak_this_), base::Bind(&PaintNothing), base::Bind(&MojoRendererService::OnRendererEnded, weak_this_), - base::Bind(&MojoRendererService::OnError, weak_this_)); + base::Bind(&MojoRendererService::OnError, weak_this_), + base::Bind(base::DoNothing)); } void MojoRendererService::OnRendererInitializeDone( |