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

6 files changed, 11 insertions, 18 deletions

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);