Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1373)

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 740663002: Relanding 'Ignore seek operations to the current time in pause state' patch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed issue with paused time Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index b1744bd1c3d4893f8ed38aa8933ab804430bea90..af5c2002b3434005f47a6d6d371d16d91ba55fa6 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -302,7 +302,13 @@ void WebMediaPlayerImpl::pause() {
pipeline_.SetPlaybackRate(0.0f);
if (data_source_)
data_source_->MediaIsPaused();
- paused_time_ = pipeline_.GetMediaTime();
+
+ // FIXME: In some cases GetMediaTime() returns a value less than duration
philipj_slow 2014/11/20 15:27:21 Would it also fix the problem to always clamp curr
DaleCurtis 2014/11/20 19:02:27 Instead, can you try modifying GetMediaTime() in m
philipj_slow 2014/11/20 19:10:43 Wouldn't that have the same problem, that currentT
DaleCurtis 2014/11/20 19:14:39 Pipeline already clamps currentTime to duration if
philipj_slow 2014/11/21 00:26:38 D'oh! If I had read the comment carefully, I would
Srirama 2014/11/21 04:05:44 But here we are trying to correct/manipulate the c
+ // even though playback has ended.
+ if (ended_)
+ paused_time_ = pipeline_.GetMediaDuration();
+ else
+ paused_time_ = pipeline_.GetMediaTime();
media_log_->AddEvent(media_log_->CreateEvent(MediaLogEvent::PAUSE));
@@ -337,8 +343,20 @@ void WebMediaPlayerImpl::seek(double seconds) {
media_log_->AddEvent(media_log_->CreateSeekEvent(seconds));
// Update our paused time.
- if (paused_)
- paused_time_ = seek_time;
+ // In paused state ignore the seek operations to current time and generate
+ // buffer state change event to eventually fire seeking and seeked events
+ if (paused_) {
+ if (paused_time_ != seek_time) {
+ paused_time_ = seek_time;
+ } else {
+ main_task_runner_->PostTask(
+ FROM_HERE,
+ base::Bind(&WebMediaPlayerImpl::OnPipelineBufferingStateChanged,
+ AsWeakPtr(),
+ BUFFERING_HAVE_ENOUGH));
+ return;
+ }
+ }
seeking_ = true;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698