diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 20:43:39 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 20:43:39 +0000 |
| commit | 756fe22bb51682e0bab0c147a7bfe7eeeb3728cd (patch) | |
| tree | ab751375689095e921da4a8252f8ba2e8b6bec36 /webkit | |
| parent | 4088c59137e1624ce99fe87d755ab52910d565bd (diff) | |
| download | chromium_src-756fe22bb51682e0bab0c147a7bfe7eeeb3728cd.zip chromium_src-756fe22bb51682e0bab0c147a7bfe7eeeb3728cd.tar.gz chromium_src-756fe22bb51682e0bab0c147a7bfe7eeeb3728cd.tar.bz2 | |
Make WebMediaPlayerImpl::duration() always return NaN in HAVE_NOTHING state.
BUG=158720
Review URL: https://chromiumcodereview.appspot.com/11360006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166747 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/media/webmediaplayer_impl.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index 87e1079..4f85a03 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -474,6 +474,9 @@ bool WebMediaPlayerImpl::seeking() const { float WebMediaPlayerImpl::duration() const { DCHECK_EQ(main_loop_, MessageLoop::current()); + if (ready_state_ == WebMediaPlayer::ReadyStateHaveNothing) + return std::numeric_limits<float>::quiet_NaN(); + base::TimeDelta duration = pipeline_->GetMediaDuration(); // Return positive infinity if the resource is unbounded. |