summaryrefslogtreecommitdiffstats
path: root/media/base/pipeline_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'media/base/pipeline_impl.cc')
-rw-r--r--media/base/pipeline_impl.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index 21b9338..a09c2c7 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -202,7 +202,11 @@ void PipelineImpl::SetVolume(float volume) {
base::TimeDelta PipelineImpl::GetCurrentTime() const {
AutoLock auto_lock(lock_);
- return clock_.Elapsed();
+ base::TimeDelta elapsed = clock_.Elapsed();
+ if (elapsed > duration_) {
+ return duration_;
+ }
+ return elapsed;
}
base::TimeDelta PipelineImpl::GetBufferedTime() const {