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 11 matching lines @@
 #include "media/base/media_switches.h"
 #include "media/base/renderer.h"
 #include "media/base/text_renderer.h"
 #include "media/base/text_track_config.h"
 #include "media/base/video_decoder_config.h"
 
 using base::TimeDelta;
 
 namespace media {
 
+// TODO(sriram): There are cases where 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.
+const int kCurrTimeErrorInMillisecondsOnPlaybackEnd = 250;

[Srirama, 2014/12/02 11:16:29]

Do we need this, or can i directly use 250 below?

[DaleCurtis, 2014/12/02 18:14:05]

Since you only have one usage, it's fine to inline it below.  Please file a bug
for this issue and link it in both of your comments.

[Srirama, 2014/12/03 14:43:02]

Done.

+
 Pipeline::Pipeline(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     MediaLog* media_log)
     : task_runner_(task_runner),
       media_log_(media_log),
       running_(false),
       did_loading_progress_(false),
       volume_(1.0f),
       playback_rate_(0.0f),
       status_(PIPELINE_OK),
@@ skipping 113 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.
   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 if current time is less
+  TimeDelta media_time = renderer_->GetMediaTime();
+  if (media_time < duration_) {
+    if ((duration_ - media_time).InMilliseconds() >
+        kCurrTimeErrorInMillisecondsOnPlaybackEnd)

[DaleCurtis, 2014/12/02 18:14:05]

You don't need the media_time < duration_ check since duration_ < media_time
will yield a negative value.  Just remove the outer conditional and inline
renderer_->GetMediaTime().

[Srirama, 2014/12/03 14:43:02]

Removed the condition but not inlined the function as it is used in two places.

+      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