Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(741)

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 684473002: Revert unintended prevention of seeks on infinite duration media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove header. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index b1744bd1c3d4893f8ed38aa8933ab804430bea90..d5a411fcb3144c02a50cee3f17795dcc51637639 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -495,15 +495,21 @@ blink::WebTimeRanges WebMediaPlayerImpl::buffered() const {
blink::WebTimeRanges WebMediaPlayerImpl::seekable() const {
DCHECK(main_task_runner_->BelongsToCurrentThread());
- // Media without duration are considered streaming and should not be seekable.
- const double seekable_end = duration();
- if (!base::IsFinite(seekable_end))
+ if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata)
return blink::WebTimeRanges();
- // If we have a finite duration then use [0, duration] as the seekable range;
- // unless it's a streaming source, in which case only allow a seek to zero.
- blink::WebTimeRange seekable_range(
- 0.0, data_source_ && data_source_->IsStreaming() ? 0.0 : seekable_end);
+ const double seekable_end = duration();
+
+ // Allow a special exception for seeks to zero for streaming sources with a
+ // finite duration; this allows looping to work.
+ const bool allow_seek_to_zero = data_source_ && data_source_->IsStreaming() &&
+ base::IsFinite(seekable_end);
+
+ // TODO(dalecurtis): Technically this allows seeking on media which return an
+ // infinite duration so long as DataSource::IsStreaming() is false. While not
+ // expected, disabling this breaks semi-live players, http://crbug.com/427412.
+ const blink::WebTimeRange seekable_range(
+ 0.0, allow_seek_to_zero ? 0.0 : seekable_end);
return blink::WebTimeRanges(&seekable_range, 1);
}
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698