summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authors.singapati <s.singapati@gmail.com>2015-09-11 16:21:20 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-11 23:21:51 +0000
commit1de0baaf064b68cd662818b33e1155a4086aa123 (patch)
tree56569ef0cb2a522a0ed2412b2bbbf92470530bd4
parent25a40be6c2877b1615f1853007710a65bc1278ea (diff)
downloadchromium_src-1de0baaf064b68cd662818b33e1155a4086aa123.zip
chromium_src-1de0baaf064b68cd662818b33e1155a4086aa123.tar.gz
chromium_src-1de0baaf064b68cd662818b33e1155a4086aa123.tar.bz2
[Android] Stop firing "progress" event from HTMLMediaElement when 100% media data loaded.
This patch updates the HTMLMediaElement's network state to "NetworkStateLoaded" when 100% buffering update is received in WebMediaPlayerAndroid. Then HTMLMediaElement stops m_progressEventTimer and resets network state to NETWORK_IDLE. BUG=529047 Review URL: https://codereview.chromium.org/1307363011 Cr-Commit-Position: refs/heads/master@{#348505}
-rw-r--r--AUTHORS1
-rw-r--r--content/renderer/media/android/webmediaplayer_android.cc3
2 files changed, 4 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index e04571c..5807736 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -497,6 +497,7 @@ Sanjoy Pal <ncj674@motorola.com>
Sanjoy Pal <sanjoy.pal@samsung.com>
Sanne Wouda <sanne.wouda@gmail.com>
Santosh Mahto <samahto@cisco.com>
+Sarath Singapati <s.singapati@gmail.com>
Sarath Singapati <s.singapati@samsung.com>
Saravanan KR <sramajay@cisco.com>
Sathish Kuppuswamy <sathish.kuppuswamy@intel.com>
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index b1aa7c3..9d86f14 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -829,6 +829,9 @@ void WebMediaPlayerAndroid::OnPlaybackComplete() {
void WebMediaPlayerAndroid::OnBufferingUpdate(int percentage) {
buffered_[0].end = duration() * percentage / 100;
did_loading_progress_ = true;
+
+ if (percentage == 100 && network_state_ < WebMediaPlayer::NetworkStateLoaded)
+ UpdateNetworkState(WebMediaPlayer::NetworkStateLoaded);
}
void WebMediaPlayerAndroid::OnSeekRequest(const base::TimeDelta& time_to_seek) {