Call NotifyDemuxerReady() only once while keys are added.

webkit/renderer/media/android/media_source_delegate.h

Index: webkit/renderer/media/android/media_source_delegate.h
diff --git a/webkit/renderer/media/android/media_source_delegate.h b/webkit/renderer/media/android/media_source_delegate.h
index dfe717f6dc145c99e15448b0e698aeda35d3e986..cb6c7440c75fbc2ca27a7e00f2a38086a6f7d2c5 100644
--- a/webkit/renderer/media/android/media_source_delegate.h
+++ b/webkit/renderer/media/android/media_source_delegate.h
@@ -72,7 +72,8 @@ class MediaSourceDelegate : public media::DemuxerHost {
 
   void CancelPendingSeek();
 
-  void NotifyDemuxerReady(const std::string& key_system);
+  void NotifyKeyAdded(const std::string& key_system,
+                      const std::string& session_id);
 
   // Called when DemuxerStreamPlayer needs to read data from ChunkDemuxer.
   // If it's the first request after the seek, |seek_done| will be true.
@@ -107,6 +108,8 @@ class MediaSourceDelegate : public media::DemuxerHost {
   scoped_ptr<media::TextTrack> OnAddTextTrack(media::TextKind kind,
                                               const std::string& label,
                                               const std::string& language);
+  void NotifyDemuxerReady(const std::string& key_system = std::string());

[xhwang, 2013/06/20 17:30:50]

Our style guide doesn't allow default arguments in general. Actually I don't see
|key_system| is used anywhere. Drop it?

[kjyoun, 2013/06/21 00:05:39]

Done.

+  bool CanNotifyDemuxerReady();
 
   // Reads an access unit from the demuxer stream |stream| and stores it in
   // the |index|th access unit in |params|.
@@ -156,6 +159,7 @@ class MediaSourceDelegate : public media::DemuxerHost {
   scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> video_params_;
 
   bool seeking_;
+  bool can_start_decrypt_;

[xhwang, 2013/06/20 17:30:50]

Key added doesn't mean we can decrypt. There may be multiple key_id in the
stream while we only added one key, e.g. audio and video requires different
keys. Or the "key" added may just be some message that the server sent to the
decryption module which doesn't necessarily contains a decryption key. I think
something like "key_added_" would be more accurate here.

[kjyoun, 2013/06/21 00:05:39]

renamed it to key_added_

On 2013/06/20 17:30:50, xhwang wrote:

   size_t access_unit_size_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);