Switch from WebMediaPlayer::maxTimeSeekable() to seekable()

content/renderer/media/android/webmediaplayer_android.cc

 // Copyright 2013 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 "content/renderer/media/android/webmediaplayer_android.h"
 
 #include <limits>
 
 #include "base/android/build_info.h"
 #include "base/bind.h"
@@ skipping 492 matching lines @@
 WebMediaPlayer::ReadyState WebMediaPlayerAndroid::readyState() const {
   return ready_state_;
 }
 
 WebTimeRanges WebMediaPlayerAndroid::buffered() const {
   if (media_source_delegate_)
     return media_source_delegate_->Buffered();
   return buffered_;
 }
 
-double WebMediaPlayerAndroid::maxTimeSeekable() const {
-  // If we haven't even gotten to ReadyStateHaveMetadata yet then just
-  // return 0 so that the seekable range is empty.
+WebTimeRanges WebMediaPlayerAndroid::seekable() const {
+  // If we haven't even gotten to ReadyStateHaveMetadata yet then there
+  // are no seekable ranges.
   if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata)
-    return 0.0;
+    return WebTimeRanges();
 

[DaleCurtis, 2014/09/26 20:45:24]

WDYT about reordering slightly so that:

const double duration = duration();
if (!duration)
  return WebTimeRanges();

<more complex steps>

I find it's best to handle the simple cases at the top, but I don't feel
strongly, so if you disagree, by all means ignore me :)

[philipj_slow, 2014/09/29 09:33:44]

Done.

-  return duration();
+  // If we have a duration then use [0, duration] as the seekable range.

[scherkus (not reviewing), 2014/09/26 18:53:27]

silly math/interval notation question: seeking to duration() is valid so using ]
is correct vs. ), right? (i.e., seekable() represents closed intervals)

[philipj_slow, 2014/09/26 20:32:02]

Right, these are inclusive intervals, not only for duration but for any seekable
range the clamping in the spec's seek algorithm make it clear that the end time
of an interval must be reachable by seeking.

+  if (double range_end = duration()) {
+    WebTimeRanges ranges(static_cast<size_t>(1));
+    ranges[0].start = 0.0;
+    ranges[0].end = range_end;
+    return ranges;
+  }
+
+  return WebTimeRanges();
 }
 
 bool WebMediaPlayerAndroid::didLoadingProgress() {
   bool ret = did_loading_progress_;
   did_loading_progress_ = false;
   return ret;
 }
 
 bool WebMediaPlayerAndroid::EnsureTextureBackedSkBitmap(GrContext* gr,
                                                         SkBitmap& bitmap,
@@ skipping 1284 matching lines @@
 
 bool WebMediaPlayerAndroid::IsHLSStream() const {
   std::string mime;
   GURL url = redirected_url_.is_empty() ? url_ : redirected_url_;
   if (!net::GetMimeTypeFromFile(base::FilePath(url.path()), &mime))
     return false;
   return !mime.compare("application/x-mpegurl");
 }
 
 }  // namespace content