Relanding 'Ignore seek operations to the current time in pause state' patch

media/base/pipeline.cc

 // Copyright (c) 2012 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 "media/base/pipeline.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 144 matching lines @@
         base::Bind(
             &Pipeline::VolumeChangedTask, weak_factory_.GetWeakPtr(), volume));
   }
 }
 
 TimeDelta Pipeline::GetMediaTime() const {
   base::AutoLock auto_lock(lock_);
   if (!renderer_)
     return TimeDelta();
 
+  // TODO(sriram): In some cases GetMediaTime() returns a value few
+  // milliseconds less than duration, even though playback has ended
+  // http://crbug.com/438581
   TimeDelta media_time = renderer_->GetMediaTime();
+  if (renderer_ended_)
+    return duration_;
+
   return std::min(media_time, duration_);
 }
 
 Ranges<TimeDelta> Pipeline::GetBufferedTimeRanges() const {
   base::AutoLock auto_lock(lock_);
   return buffered_time_ranges_;
 }
 
 TimeDelta Pipeline::GetMediaDuration() const {
   base::AutoLock auto_lock(lock_);
@@ skipping 451 matching lines @@
 
 void Pipeline::RunEndedCallbackIfNeeded() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (renderer_ && !renderer_ended_)
     return;
 
   if (text_renderer_ && text_renderer_->HasTracks() && !text_renderer_ended_)
     return;
 
+  // Correct the duration against current time if it turns out that
+  // the initially reported duration is wrong
+  // TODO(sriram): There are cases where duration is correct and current time
+  // falls short of duration by a few milliseconds. This is a workaround
+  // till we find the actual fix and 250ms is chosen here as it is
+  // the max time between timeupdate events (http://crbug.com/438581).
+  TimeDelta media_time = renderer_->GetMediaTime();
+  if ((duration_ - media_time).InMilliseconds() > 250)
+    SetDuration(media_time);
+
   DCHECK_EQ(status_, PIPELINE_OK);
   ended_cb_.Run();
 }
 
 scoped_ptr<TextRenderer> Pipeline::CreateTextRenderer() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(switches::kEnableInbandTextTracks))
     return scoped_ptr<media::TextRenderer>();
@@ skipping 66 matching lines @@
   metadata_cb_.Run(metadata);
 }
 
 void Pipeline::BufferingStateChanged(BufferingState new_buffering_state) {
   DVLOG(1) << __FUNCTION__ << "(" << new_buffering_state << ") ";
   DCHECK(task_runner_->BelongsToCurrentThread());
   buffering_state_cb_.Run(new_buffering_state);
 }
 
 }  // namespace media