Fixing dropped seeks.

media/base/pipeline_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.
 //
 // TODO(scherkus): clean up PipelineImpl... too many crazy function names,
 // potential deadlocks, etc...
 
 #include "media/base/pipeline_impl.h"
 
 #include <algorithm>
@@ skipping 46 matching lines @@
 class PipelineImpl::PipelineInitState {
  public:
   scoped_refptr<AudioDecoder> audio_decoder_;
   scoped_refptr<VideoDecoder> video_decoder_;
   scoped_refptr<CompositeFilter> composite_;
 };
 
 PipelineImpl::PipelineImpl(MessageLoop* message_loop, MediaLog* media_log)
     : message_loop_(message_loop),
       media_log_(media_log),
-      network_activity_(false),
       clock_(new Clock(&base::Time::Now)),
       waiting_for_clock_update_(false),
       state_(kCreated),
       current_bytes_(0) {
   media_log_->AddEvent(media_log_->CreatePipelineStateChangedEvent(kCreated));
   ResetState();
   media_log_->AddEvent(
       media_log_->CreateEvent(MediaLogEvent::PIPELINE_CREATED));
 }
 
@@ skipping 786 matching lines @@
     demuxer_->SetPreload(preload);
 }
 
 void PipelineImpl::SeekTask(base::TimeDelta time,
                             const PipelineStatusCB& seek_callback) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK(!IsPipelineStopPending());
 
   // Suppress seeking if we're not fully started.
   if (state_ != kStarted && state_ != kEnded) {
-    // TODO(scherkus): should we run the callback?  I'm tempted to say the API
-    // will only execute the first Seek() request.
+    if (!seek_callback.is_null())
+      seek_callback.Run(PIPELINE_ERROR_INVALID_STATE);

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

Does this still get called, considering the guard you added to
webmediaplayerimpl?

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

You are right, it's not called. Reverted that lines.

     VLOG(1) << "Media pipeline has not started, ignoring seek to "
-              << time.InMicroseconds();
+            << time.InMicroseconds();
     return;
   }
 
   DCHECK(!seek_pending_);
   seek_pending_ = true;
 
   // We'll need to pause every filter before seeking.  The state transition
   // is as follows:
   //   kStarted/kEnded
   //   kPausing (for each filter)
@@ skipping 440 matching lines @@
     case kStopping:
     case kStopped:
       NOTREACHED() << "Unexpected state for teardown: " << state_;
       break;
     // default: intentionally left out to force new states to cause compiler
     // errors.
   };
 }
 
 }  // namespace media