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..cc71521c6dac0a579815b8b1128ffa8e91749e9a 100644 |
--- a/webkit/renderer/media/android/media_source_delegate.h |
+++ b/webkit/renderer/media/android/media_source_delegate.h |
@@ -72,7 +72,7 @@ class MediaSourceDelegate : public media::DemuxerHost { |
void CancelPendingSeek(); |
- void NotifyDemuxerReady(const std::string& key_system); |
+ void NotifyKeyAdded(const std::string& key_system); |
// 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 +107,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); |
+ bool CanNotifyDemuxerReady(); |
// Reads an access unit from the demuxer stream |stream| and stores it in |
// the |index|th access unit in |params|. |
@@ -156,6 +158,7 @@ class MediaSourceDelegate : public media::DemuxerHost { |
scoped_ptr<media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params> video_params_; |
bool seeking_; |
+ bool key_added_; |
size_t access_unit_size_; |
DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate); |