Revert unintended prevention of seeks on infinite duration media.

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"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/float_util.h"

[wolenetz, 2014/10/27 20:14:25]

nit: do we no longer need this since we're dropping base::IsFinite usage in this
CL?

[DaleCurtis, 2014/10/27 20:20:41]

Done.

 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/video_layer.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_frame.h"
@@ skipping 493 matching lines @@
   return ready_state_;
 }
 
 blink::WebTimeRanges WebMediaPlayerAndroid::buffered() const {
   if (media_source_delegate_)
     return media_source_delegate_->Buffered();
   return buffered_;
 }
 
 blink::WebTimeRanges WebMediaPlayerAndroid::seekable() const {
-  // 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.
-  blink::WebTimeRange seekable_range(0.0, seekable_end);
+  // TODO(dalecurtis): Technically this allows seeking on media which return an
+  // infinite duration.  While not expected, disabling this breaks semi-live
+  // players, http://crbug.com/427412.
+  const blink::WebTimeRange seekable_range(0.0, duration());

[wolenetz, 2014/10/27 20:14:25]

Versus pre-621573002, we now allow for duration() to be 0.0, and return seekable
range [0.0,0.0] instead of empty WebTimeRanges().  Is this intended?

[DaleCurtis, 2014/10/27 20:20:41]

Nice eye, it was intended in my original CL and I didn't see any reason to
revert that behavior here. It ensures the media always has a seekable range. 
Support for 200-type sources is at the mercy of Android's player.

[wolenetz, 2014/10/27 20:26:47]

Acknowledged.

   return blink::WebTimeRanges(&seekable_range, 1);
 }
 
 bool WebMediaPlayerAndroid::didLoadingProgress() {
   bool ret = did_loading_progress_;
   did_loading_progress_ = false;
   return ret;
 }
 
 bool WebMediaPlayerAndroid::EnsureTextureBackedSkBitmap(GrContext* gr,
@@ skipping 1281 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