Fix black video frames when seeking (which also fixes flashing poster issue).

webkit/glue/webmediaplayer_impl.cc

 // Copyright (c) 2010 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 "base/callback.h"
 #include "base/command_line.h"
@@ skipping 215 matching lines @@
 WebMediaPlayerImpl::WebMediaPlayerImpl(
     WebKit::WebMediaPlayerClient* client,
     media::FilterCollection* collection)
     : network_state_(WebKit::WebMediaPlayer::Empty),
       ready_state_(WebKit::WebMediaPlayer::HaveNothing),
       main_loop_(NULL),
       filter_collection_(collection),
       pipeline_(NULL),
       pipeline_thread_("PipelineThread"),
       paused_(true),
+      seeking_(false),
       playback_rate_(0.0f),
       client_(client),
       proxy_(NULL),
       pipeline_stopped_(false, false) {
   // Saves the current message loop.
   DCHECK(!main_loop_);
   main_loop_ = MessageLoop::current();
 }
 
 bool WebMediaPlayerImpl::Initialize(
@@ skipping 115 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;
   }
 
-  // Drop our ready state if the media file isn't fully loaded.
-  if (!pipeline_->IsLoaded()) {
-    SetReadyState(WebKit::WebMediaPlayer::HaveMetadata);
-  }
-
   // Try to preserve as much accuracy as possible.
   float microseconds = seconds * base::Time::kMicrosecondsPerSecond;
   base::TimeDelta seek_time =
       base::TimeDelta::FromMicroseconds(static_cast<int64>(microseconds));
 
   // Update our paused time.
   if (paused_) {
     paused_time_ = seek_time;
   }
 
+  seeking_ = true;
+
   // Kick off the asynchronous seek!
   pipeline_->Seek(
       seek_time,
       NewCallback(proxy_.get(),
                   &WebMediaPlayerImpl::Proxy::PipelineSeekCallback));
 }
 
 void WebMediaPlayerImpl::setEndTime(float seconds) {
   DCHECK(MessageLoop::current() == main_loop_);
 
@@ skipping 73 matching lines @@
 
   return pipeline_->GetPlaybackRate() == 0.0f;
 }
 
 bool WebMediaPlayerImpl::seeking() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
   if (ready_state_ == WebKit::WebMediaPlayer::HaveNothing)
     return false;
 
-  return ready_state_ == WebKit::WebMediaPlayer::HaveMetadata;
+  return seeking_;
 }
 
 float WebMediaPlayerImpl::duration() const {
   DCHECK(MessageLoop::current() == main_loop_);
 
   base::TimeDelta duration = pipeline_->GetMediaDuration();
   if (duration.InMicroseconds() == media::Limits::kMaxTimeInMicroseconds)
     return std::numeric_limits<float>::infinity();
   return static_cast<float>(duration.InSecondsF());
 }
@@ skipping 208 matching lines @@
 
 void WebMediaPlayerImpl::OnPipelineSeek() {
   DCHECK(MessageLoop::current() == main_loop_);
   if (pipeline_->GetError() == media::PIPELINE_OK) {
     // Update our paused time.
     if (paused_) {
       paused_time_ = pipeline_->GetCurrentTime();
     }
 
     SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData);
+    seeking_ = false;
     GetClient()->timeChanged();
   }
 }
 
 void WebMediaPlayerImpl::OnPipelineEnded() {
   DCHECK(MessageLoop::current() == main_loop_);
   if (pipeline_->GetError() == media::PIPELINE_OK) {
     GetClient()->timeChanged();
   }
 }
@@ skipping 90 matching lines @@
   pipeline_stopped_.Signal();
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_glue