| Index: media/blink/webmediaplayer_impl.cc
|
| diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
|
| index 12839eb06eeceecbc38ef54299c90695a5cd0ae6..01cd2cc1c68ac3dade5637d7ae5810932bb8b5b2 100644
|
| --- a/media/blink/webmediaplayer_impl.cc
|
| +++ b/media/blink/webmediaplayer_impl.cc
|
| @@ -678,6 +678,10 @@ void WebMediaPlayerImpl::OnEncryptedMediaInitData(
|
| base::saturated_cast<unsigned int>(init_data.size()));
|
| }
|
|
|
| +void WebMediaPlayerImpl::OnWaitingForEncryptionKey() {
|
| + client_->waitingForKey();
|
| +}
|
| +
|
| void WebMediaPlayerImpl::SetCdm(CdmContext* cdm_context,
|
| const CdmAttachedCB& cdm_attached_cb) {
|
| pipeline_.SetCdm(cdm_context, cdm_attached_cb);
|
| @@ -879,9 +883,8 @@ void WebMediaPlayerImpl::StartPipeline() {
|
| seeking_ = true;
|
|
|
| pipeline_.Start(
|
| - demuxer_.get(),
|
| - renderer_factory_->CreateRenderer(media_task_runner_,
|
| - audio_source_provider_.get()),
|
| + demuxer_.get(), renderer_factory_->CreateRenderer(
|
| + media_task_runner_, audio_source_provider_.get()),
|
| BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineEnded),
|
| BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineError),
|
| BIND_TO_RENDER_LOOP1(&WebMediaPlayerImpl::OnPipelineSeeked, false),
|
| @@ -889,7 +892,8 @@ void WebMediaPlayerImpl::StartPipeline() {
|
| BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineBufferingStateChanged),
|
| base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)),
|
| BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDurationChanged),
|
| - BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnAddTextTrack));
|
| + BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnAddTextTrack),
|
| + BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnWaitingForEncryptionKey));
|
| }
|
|
|
| void WebMediaPlayerImpl::SetNetworkState(WebMediaPlayer::NetworkState state) {
|
|
|