MediaSourceDelegate: Fix DecryptingDemuxerStream initialization logic.

content/renderer/media/android/media_source_delegate.cc

Index: content/renderer/media/android/media_source_delegate.cc
diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc
index b9ffb03d443c900ee0d19e1929838bae4f7c949e..20865ffe6be768ff216160cc2a6dbfd05a3ccb93 100644
--- a/content/renderer/media/android/media_source_delegate.cc
+++ b/content/renderer/media/android/media_source_delegate.cc
@@ -153,6 +153,8 @@ void MediaSourceDelegate::InitializeMediaSource(
     const base::Closure& waiting_for_decryption_key_cb) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   DCHECK(!media_source_opened_cb.is_null());
+  DCHECK(!set_cdm_ready_cb.is_null());
+

[ddorwin, 2016/01/22 00:58:35]

Should we check all cb parameters?

[xhwang, 2016/01/29 00:47:15]

Done.

   media_source_opened_cb_ = media_source_opened_cb;
   encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
   set_cdm_ready_cb_ = media::BindToCurrentLoop(set_cdm_ready_cb);
@@ -496,16 +498,14 @@ void MediaSourceDelegate::OnDemuxerInitDone(media::PipelineStatus status) {
   audio_stream_ = chunk_demuxer_->GetStream(DemuxerStream::AUDIO);
   video_stream_ = chunk_demuxer_->GetStream(DemuxerStream::VIDEO);
 
-  if (audio_stream_ && audio_stream_->audio_decoder_config().is_encrypted() &&
-      !set_cdm_ready_cb_.is_null()) {
+  if (audio_stream_ && audio_stream_->audio_decoder_config().is_encrypted()) {
     InitAudioDecryptingDemuxerStream();
     // InitVideoDecryptingDemuxerStream() will be called in
     // OnAudioDecryptingDemuxerStreamInitDone().
     return;
   }
 
-  if (video_stream_ && video_stream_->video_decoder_config().is_encrypted() &&
-      !set_cdm_ready_cb_.is_null()) {
+  if (video_stream_ && video_stream_->video_decoder_config().is_encrypted()) {
     InitVideoDecryptingDemuxerStream();
     return;
   }
@@ -519,7 +519,6 @@ void MediaSourceDelegate::InitAudioDecryptingDemuxerStream() {
   DCHECK(media_task_runner_->BelongsToCurrentThread());
   DVLOG(1) << __FUNCTION__ << " : " << demuxer_client_id_;
   DCHECK(!set_cdm_ready_cb_.is_null());
-
   audio_decrypting_demuxer_stream_.reset(new media::DecryptingDemuxerStream(
       media_task_runner_, media_log_, waiting_for_decryption_key_cb_));
   audio_decrypting_demuxer_stream_->Initialize(
@@ -547,10 +546,14 @@ void MediaSourceDelegate::OnAudioDecryptingDemuxerStreamInitDone(
   DVLOG(1) << __FUNCTION__ << "(" << status << ") : " << demuxer_client_id_;
   DCHECK(chunk_demuxer_);
 
-  if (status != media::PIPELINE_OK)
+  if (status != media::PIPELINE_OK) {
     audio_decrypting_demuxer_stream_.reset();
-  else
-    audio_stream_ = audio_decrypting_demuxer_stream_.get();
+    is_demuxer_ready_ = true;

[ddorwin, 2016/01/22 00:58:35]

This is probably worth a comment (explaining why we say "ready" when we failed.

[xhwang, 2016/01/29 00:47:15]

Done.

+    NotifyDemuxerReady();
+    return;
+  }
+
+  audio_stream_ = audio_decrypting_demuxer_stream_.get();
 
   if (video_stream_ && video_stream_->video_decoder_config().is_encrypted()) {
     InitVideoDecryptingDemuxerStream();