Fixing dropped seeks.

webkit/glue/webmediaplayer_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 
 #include "base/callback.h"
@@ skipping 81 matching lines @@
     media::MediaLog* media_log)
     : network_state_(WebKit::WebMediaPlayer::Empty),
       ready_state_(WebKit::WebMediaPlayer::HaveNothing),
       main_loop_(NULL),
       filter_collection_(collection),
       pipeline_(NULL),
       message_loop_factory_(message_loop_factory),
       paused_(true),
       seeking_(false),
       playback_rate_(0.0f),
+      pending_seek_(false),
       client_(client),
       proxy_(NULL),
       media_stream_client_(media_stream_client),
       media_log_(media_log) {
   // Saves the current message loop.
   DCHECK(!main_loop_);
   main_loop_ = MessageLoop::current();
   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
 }
@@ skipping 176 matching lines @@
   // cause extra pre-rolling and will break servers without range request
   // support.
   //
   // We still have to notify WebKit that time has changed otherwise
   // HTMLMediaElement gets into an inconsistent state.
   if (pipeline_->GetCurrentTime().ToInternalValue() == 0 && seconds == 0) {
     GetClient()->timeChanged();
     return;
   }
 
+  if (seeking_) {
+    pending_seek_ = true;
+    pending_seek_seconds_ = seconds;
+    return;
+  }
+
   media_log_->AddEvent(media_log_->CreateSeekEvent(seconds));
 
   base::TimeDelta seek_time = ConvertSecondsToTimestamp(seconds);
 
   // Update our paused time.
   if (paused_) {
     paused_time_ = seek_time;
   }
 
   seeking_ = true;
@@ skipping 386 matching lines @@
 
 void WebMediaPlayerImpl::OnPipelineSeek(PipelineStatus status) {
   DCHECK(MessageLoop::current() == main_loop_);
   if (status == media::PIPELINE_OK) {
     // Update our paused time.
     if (paused_) {
       paused_time_ = pipeline_->GetCurrentTime();
     }
 
     SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData);
-    seeking_ = false;
     GetClient()->timeChanged();
   }
+  seeking_ = false;

[Ami GONE FROM CHROMIUM, 2011/09/13 20:12:58]

Curious about the reason for this move.

[SeRya, 2011/09/13 22:14:21]

Player should leave "seeking" state whether seek succeeded or not. Otherwise all
the next seeks will be forever pending.

+
+  if (pending_seek_) {
+    pending_seek_ = false;
+    seek(pending_seek_seconds_);
+  }
 }
 
 void WebMediaPlayerImpl::OnPipelineEnded(PipelineStatus status) {
   DCHECK(MessageLoop::current() == main_loop_);
   if (status == media::PIPELINE_OK) {
     GetClient()->timeChanged();
   }
 }
 
 void WebMediaPlayerImpl::OnPipelineError(PipelineStatus error) {
@@ skipping 98 matching lines @@
   }
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_glue