| Index: media/base/pipeline.cc
|
| diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
|
| index 3d210d40c42388bd329f25235f54f496138194d2..9ce867d8ac6fa45c33c60be1c9647123e0cbd699 100644
|
| --- a/media/base/pipeline.cc
|
| +++ b/media/base/pipeline.cc
|
| @@ -163,17 +163,8 @@ void Pipeline::SetVolume(float 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_);
|
| + return renderer_ ? std::min(renderer_->GetMediaTime(), duration_)
|
| + : TimeDelta();
|
| }
|
|
|
| Ranges<TimeDelta> Pipeline::GetBufferedTimeRanges() const {
|
|
|