WebMediaPlayerAndroid - handling unseekable durations

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/bind.h"
 #include "base/command_line.h"
@@ skipping 443 matching lines @@
 
 bool WebMediaPlayerAndroid::seeking() const {
   return seeking_;
 }
 
 double WebMediaPlayerAndroid::duration() const {
   // HTML5 spec requires duration to be NaN if readyState is HAVE_NOTHING
   if (ready_state_ == WebMediaPlayer::ReadyStateHaveNothing)
     return std::numeric_limits<double>::quiet_NaN();
 
-  // TODO(wolenetz): Correctly handle durations that MediaSourcePlayer
-  // considers unseekable, including kInfiniteDuration().

[acolwell GONE FROM CHROMIUM, 2014/01/14 16:36:40]

This comment should not be removed since this code still isn't handling
kInfiniteDuration().

If you add the following then removing this comment is ok.

if (duration_ == media::kInfiniteDuration())
    return std::numeric_limits<double>::infinity();

[amogh.bihani, 2014/01/15 06:33:02]

initially when i had stopped duration to be more than 2^31, this was being
hadled as kInfiniteDuration is 2^63. Forgot to change this when i removed it in
second patchset.
Ill do the change as suggested buy you.

[amogh.bihani, 2014/01/15 06:33:02]

Done.

-  // See http://crbug.com/248396
   return duration_.InSecondsF();
 }
 
 double WebMediaPlayerAndroid::currentTime() const {
   // If the player is processing a seek, return the seek time.
   // Blink may still query us if updatePlaybackState() occurs while seeking.
   if (seeking()) {
     return pending_seek_ ?
         pending_seek_time_.InSecondsF() : seek_time_.InSecondsF();
   }
@@ skipping 17 matching lines @@
   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.
   if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata)
     return 0.0;
 

[acolwell GONE FROM CHROMIUM, 2014/01/14 16:36:40]

You also need the following to properly handle clips with an infinite duration.

if (duration() == std::numeric_limits<double>::infinity())
  return 0;

[amogh.bihani, 2014/01/15 06:33:02]

Done.

-  // TODO(hclam): If this stream is not seekable this should return 0.
-  return duration();
+  return std::min(std::numeric_limits<int32>max(), duration());
 }
 
 bool WebMediaPlayerAndroid::didLoadingProgress() const {
   bool ret = did_loading_progress_;
   did_loading_progress_ = false;
   return ret;
 }
 
 void WebMediaPlayerAndroid::paint(blink::WebCanvas* canvas,
                                   const blink::WebRect& rect,
@@ skipping 95 matching lines @@
 
 void WebMediaPlayerAndroid::OnMediaMetadataChanged(
     const base::TimeDelta& duration, int width, int height, bool success) {
   bool need_to_signal_duration_changed = false;
 
   if (url_.SchemeIs("file"))
     UpdateNetworkState(WebMediaPlayer::NetworkStateLoaded);
 
   // Update duration, if necessary, prior to ready state updates that may
   // cause duration() query.
-  // TODO(wolenetz): Correctly handle durations that MediaSourcePlayer
-  // considers unseekable, including kInfiniteDuration().
-  // See http://crbug.com/248396
   if (!ignore_metadata_duration_change_ && duration_ != duration) {
     duration_ = duration;
 
     // Client readyState transition from HAVE_NOTHING to HAVE_METADATA
     // already triggers a durationchanged event. If this is a different
     // transition, remember to signal durationchanged.
     // Do not ever signal durationchanged on metadata change in MSE case
     // because OnDurationChanged() handles this.
     if (ready_state_ > WebMediaPlayer::ReadyStateHaveNothing &&
         player_type_ != MEDIA_PLAYER_TYPE_MEDIA_SOURCE) {
@@ skipping 186 matching lines @@
 
 void WebMediaPlayerAndroid::OnRequestFullscreen() {
   client_->requestFullscreen();
 }
 
 void WebMediaPlayerAndroid::OnDurationChanged(const base::TimeDelta& duration) {
   DCHECK(main_loop_->BelongsToCurrentThread());
   // Only MSE |player_type_| registers this callback.
   DCHECK_EQ(player_type_, MEDIA_PLAYER_TYPE_MEDIA_SOURCE);
 
+  // MediaSourcePlayer assumes duration more than 2^31 as unseekable
+  // because java player uses 32-bit integer for time at millisecond resolution
+  if (duration >=

[acolwell GONE FROM CHROMIUM, 2014/01/14 16:36:40]

This prevents Blink from being notified of the new duration. I think these
changes should be removed. The seekable range logic should prevent the seeking
to times outside the range.

[amogh.bihani, 2014/01/15 06:33:02]

Done.

+          base::TimeDelta::FromMilliseconds(std::numeric_limits<int32>max())) {
+    return;
+  }
+
   // Cache the new duration value and trust it over any subsequent duration
   // values received in OnMediaMetadataChanged().
-  // TODO(wolenetz): Correctly handle durations that MediaSourcePlayer
-  // considers unseekable, including kInfiniteDuration().
-  // See http://crbug.com/248396
   duration_ = duration;
   ignore_metadata_duration_change_ = true;
 
   // Notify MediaPlayerClient that duration has changed, if > HAVE_NOTHING.
   if (ready_state_ > WebMediaPlayer::ReadyStateHaveNothing)
     client_->durationChanged();
 }
 
 void WebMediaPlayerAndroid::UpdateNetworkState(
     WebMediaPlayer::NetworkState state) {
@@ skipping 616 matching lines @@
 
 void WebMediaPlayerAndroid::exitFullscreen() {
   manager_->ExitFullscreen(player_id_);
 }
 
 bool WebMediaPlayerAndroid::canEnterFullscreen() const {
   return manager_->CanEnterFullscreen(frame_);
 }
 
 }  // namespace content