Chromium Code Reviews| Index: media/blink/webmediaplayer_impl.cc |
| diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc |
| index 12839eb06eeceecbc38ef54299c90695a5cd0ae6..be327aa3eed40aa4f6104be016da691538dbd8f6 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::OnWaitingForDecryptionKey() { |
| + // client_->waitingForKey(); |
|
jrummell
2015/02/23 22:06:32
Forgot to update this. There are 2 options.
1) Ca
ddorwin
2015/02/23 23:47:47
Let's start with the simple solution then re-evalu
jrummell
2015/02/24 01:19:39
Done.
|
| +} |
| + |
| void WebMediaPlayerImpl::SetCdm(CdmContext* cdm_context, |
| const CdmAttachedCB& cdm_attached_cb) { |
| pipeline_.SetCdm(cdm_context, cdm_attached_cb); |
| @@ -889,7 +893,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::OnWaitingForDecryptionKey)); |
| } |
| void WebMediaPlayerImpl::SetNetworkState(WebMediaPlayer::NetworkState state) { |