Remove seek_done parameter from ReadFromDemuxer.

BUG=251876
TEST=none

Review URL: https://chromiumcodereview.appspot.com/17716002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208921 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 23 insertions, 35 deletions

diff --git a/content/browser/android/media_player_manager_impl.cc b/content/browser/android/media_player_manager_impl.cc
index bce3b86..2bad229 100644
--- a/content/browser/android/media_player_manager_impl.cc
+++ b/content/browser/android/media_player_manager_impl.cc
@@ -194,9 +194,8 @@ void MediaPlayerManagerImpl::OnVideoSizeChanged(
 }
 
 void MediaPlayerManagerImpl::OnReadFromDemuxer(
-    int player_id, media::DemuxerStream::Type type, bool seek_done) {
-  Send(new MediaPlayerMsg_ReadFromDemuxer(
-      routing_id(), player_id, type, seek_done));
+    int player_id, media::DemuxerStream::Type type) {
+  Send(new MediaPlayerMsg_ReadFromDemuxer(routing_id(), player_id, type));
 }
 
 void MediaPlayerManagerImpl::RequestMediaResources(int player_id) {
diff --git a/content/browser/android/media_player_manager_impl.h b/content/browser/android/media_player_manager_impl.h
index 00d3ce4..178ebea 100644
--- a/content/browser/android/media_player_manager_impl.h
+++ b/content/browser/android/media_player_manager_impl.h
@@ -65,10 +65,8 @@ class CONTENT_EXPORT MediaPlayerManagerImpl
   virtual void OnError(int player_id, int error) OVERRIDE;
   virtual void OnVideoSizeChanged(
       int player_id, int width, int height) OVERRIDE;
-  virtual void OnReadFromDemuxer(
-      int player_id,
-      media::DemuxerStream::Type type,
-      bool seek_done) OVERRIDE;
+  virtual void OnReadFromDemuxer(int player_id,
+                                 media::DemuxerStream::Type type) OVERRIDE;
   virtual void RequestMediaResources(int player_id) OVERRIDE;
   virtual void ReleaseMediaResources(int player_id) OVERRIDE;
   virtual media::MediaResourceGetter* GetMediaResourceGetter() OVERRIDE;
diff --git a/content/common/media/media_player_messages_android.h b/content/common/media/media_player_messages_android.h
index 0994a37..ce60970 100644
--- a/content/common/media/media_player_messages_android.h
+++ b/content/common/media/media_player_messages_android.h
@@ -133,10 +133,9 @@ IPC_MESSAGE_ROUTED3(MediaPlayerMsg_MediaSeekRequest,
                     uint32 /* seek_request_id */)
 
 // The media source player reads data from demuxer
-IPC_MESSAGE_ROUTED3(MediaPlayerMsg_ReadFromDemuxer,
+IPC_MESSAGE_ROUTED2(MediaPlayerMsg_ReadFromDemuxer,
                     int /* player_id */,
-                    media::DemuxerStream::Type /* type */,
-                    bool /* seek_done */)
+                    media::DemuxerStream::Type /* type */)
 
 // The player needs new config data
 IPC_MESSAGE_ROUTED1(MediaPlayerMsg_MediaConfigRequest,
diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc
index 4661dd2..ec8326c 100644
--- a/content/renderer/media/android/media_source_delegate.cc
+++ b/content/renderer/media/android/media_source_delegate.cc
@@ -208,13 +208,10 @@ void MediaSourceDelegate::SetDuration(base::TimeDelta duration) {
     duration_change_cb_.Run(duration);
 }
 
-void MediaSourceDelegate::OnReadFromDemuxer(media::DemuxerStream::Type type,
-                                            bool seek_done) {
-  DVLOG(1) << "OnReadFromDemuxer(" << type << ", " << seek_done
-           << ") : " << player_id_;
-  if (seeking_ && !seek_done)
-      return;  // Drop the request during seeking.
-  seeking_ = false;
+void MediaSourceDelegate::OnReadFromDemuxer(media::DemuxerStream::Type type) {
+  DVLOG(1) << "OnReadFromDemuxer(" << type << ") : " << player_id_;
+  if (seeking_)
+    return;  // Drop the request during seeking.
 
   DCHECK(type == DemuxerStream::AUDIO || type == DemuxerStream::VIDEO);
   // The access unit size should have been initialized properly at this stage.
diff --git a/content/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h
index a1df628..a91b306 100644
--- a/content/renderer/media/android/media_source_delegate.h
+++ b/content/renderer/media/android/media_source_delegate.h
@@ -75,8 +75,7 @@ class MediaSourceDelegate : public media::DemuxerHost {
   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.
-  void OnReadFromDemuxer(media::DemuxerStream::Type type, bool seek_done);
+  void OnReadFromDemuxer(media::DemuxerStream::Type type);
 
   // Called when the player needs the new config data from ChunkDemuxer.
   void OnMediaConfigRequest();
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index 6e7bbeec..7096924 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -1132,10 +1132,9 @@ bool WebMediaPlayerAndroid::InjectMediaStream(
 }
 #endif
 
-void WebMediaPlayerAndroid::OnReadFromDemuxer(
-    media::DemuxerStream::Type type, bool seek_done) {
+void WebMediaPlayerAndroid::OnReadFromDemuxer(media::DemuxerStream::Type type) {
   if (media_source_delegate_)
-    media_source_delegate_->OnReadFromDemuxer(type, seek_done);
+    media_source_delegate_->OnReadFromDemuxer(type);
   else
     NOTIMPLEMENTED();
 }
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h
index 66321d0..31f4c9f 100644
--- a/content/renderer/media/android/webmediaplayer_android.h
+++ b/content/renderer/media/android/webmediaplayer_android.h
@@ -234,7 +234,7 @@ class WebMediaPlayerAndroid
 #endif
 
   // Called when DemuxerStreamPlayer needs to read data from ChunkDemuxer.
-  void OnReadFromDemuxer(media::DemuxerStream::Type type, bool seek_done);
+  void OnReadFromDemuxer(media::DemuxerStream::Type type);
 
  protected:
   // Helper method to update the playing state.
diff --git a/content/renderer/media/android/webmediaplayer_proxy_android.cc b/content/renderer/media/android/webmediaplayer_proxy_android.cc
index f7d0f01..0860585 100644
--- a/content/renderer/media/android/webmediaplayer_proxy_android.cc
+++ b/content/renderer/media/android/webmediaplayer_proxy_android.cc
@@ -207,11 +207,10 @@ void WebMediaPlayerProxyAndroid::DidCommitCompositorFrame() {
 
 void WebMediaPlayerProxyAndroid::OnReadFromDemuxer(
     int player_id,
-    media::DemuxerStream::Type type,
-    bool seek_done) {
+    media::DemuxerStream::Type type) {
   WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
   if (player)
-    player->OnReadFromDemuxer(type, seek_done);
+    player->OnReadFromDemuxer(type);
 }
 
 void WebMediaPlayerProxyAndroid::DemuxerReady(
diff --git a/content/renderer/media/android/webmediaplayer_proxy_android.h b/content/renderer/media/android/webmediaplayer_proxy_android.h
index ec1927f..8fed11b 100644
--- a/content/renderer/media/android/webmediaplayer_proxy_android.h
+++ b/content/renderer/media/android/webmediaplayer_proxy_android.h
@@ -109,8 +109,7 @@ class WebMediaPlayerProxyAndroid : public RenderViewObserver {
   void OnPlayerPlay(int player_id);
   void OnPlayerPause(int player_id);
   void OnReadFromDemuxer(int player_id,
-                         media::DemuxerStream::Type type,
-                         bool seek_done);
+                         media::DemuxerStream::Type type);
   void OnMediaSeekRequest(int player_id,
                           base::TimeDelta time_to_seek,
                           unsigned seek_request_id);
diff --git a/media/base/android/media_player_manager.h b/media/base/android/media_player_manager.h
index 69d6792..9baa514 100644
--- a/media/base/android/media_player_manager.h
+++ b/media/base/android/media_player_manager.h
@@ -97,8 +97,8 @@ class MEDIA_EXPORT MediaPlayerManager {
   virtual void DestroyAllMediaPlayers() = 0;
 
   // Callback when DemuxerStreamPlayer wants to read data from the demuxer.
-  virtual void OnReadFromDemuxer(
-      int player_id, media::DemuxerStream::Type type, bool seek_done) = 0;
+  virtual void OnReadFromDemuxer(int player_id,
+                                 media::DemuxerStream::Type type) = 0;
 
   // Called when player wants the media element to initiate a seek.
   virtual void OnMediaSeekRequest(int player_id, base::TimeDelta time_to_seek,
diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc
index bbc7b47..013f977 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -596,7 +596,7 @@ void MediaSourcePlayer::MediaDecoderCallback(
 void MediaSourcePlayer::DecodeMoreAudio() {
   if (audio_access_unit_index_ >= received_audio_.access_units.size()) {
     if (!waiting_for_audio_data_) {
-      manager()->OnReadFromDemuxer(player_id(), DemuxerStream::AUDIO, true);
+      manager()->OnReadFromDemuxer(player_id(), DemuxerStream::AUDIO);
       received_audio_ = MediaPlayerHostMsg_ReadFromDemuxerAck_Params();
       audio_access_unit_index_ = 0;
       waiting_for_audio_data_ = true;
@@ -625,7 +625,7 @@ void MediaSourcePlayer::DecodeMoreAudio() {
 void MediaSourcePlayer::DecodeMoreVideo() {
   if (video_access_unit_index_ >= received_video_.access_units.size()) {
     if (!waiting_for_video_data_) {
-      manager()->OnReadFromDemuxer(player_id(), DemuxerStream::VIDEO, true);
+      manager()->OnReadFromDemuxer(player_id(), DemuxerStream::VIDEO);
       received_video_ = MediaPlayerHostMsg_ReadFromDemuxerAck_Params();
       video_access_unit_index_ = 0;
       waiting_for_video_data_ = true;
@@ -651,7 +651,6 @@ void MediaSourcePlayer::DecodeMoreVideo() {
                  weak_this_.GetWeakPtr(), false));
 }
 
-
 void MediaSourcePlayer::PlaybackCompleted(bool is_audio) {
   if (is_audio)
     audio_finished_ = true;
diff --git a/media/base/android/media_source_player_unittest.cc b/media/base/android/media_source_player_unittest.cc
index d139be6..76c1e46 100644
--- a/media/base/android/media_source_player_unittest.cc
+++ b/media/base/android/media_source_player_unittest.cc
@@ -44,8 +44,8 @@ class MockMediaPlayerManager : public MediaPlayerManager {
   virtual MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE { return NULL; }
   virtual MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE { return NULL; }
   virtual void DestroyAllMediaPlayers() OVERRIDE {}
-  virtual void OnReadFromDemuxer(int player_id, media::DemuxerStream::Type type,
-                                 bool seek_done) OVERRIDE {
+  virtual void OnReadFromDemuxer(int player_id,
+                                 media::DemuxerStream::Type type) OVERRIDE {
     num_requests_++;
     if (message_loop_.is_running())
       message_loop_.Quit();