Introduce CancelUponDeferral() to buffered media loaders.

media/blink/webmediaplayer_impl.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 "media/blink/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 771 matching lines @@
   if (error == PIPELINE_ERROR_DECRYPT)
     encrypted_media_support_.OnPipelineDecryptError();
 }
 
 void WebMediaPlayerImpl::OnPipelineMetadata(
     PipelineMetadata metadata) {
   DVLOG(1) << __FUNCTION__;
 
   pipeline_metadata_ = metadata;
 
-  UMA_HISTOGRAM_ENUMERATION("Media.VideoRotation",
-                            metadata.video_rotation,
+  UMA_HISTOGRAM_ENUMERATION("Media.VideoRotation", metadata.video_rotation,
                             VIDEO_ROTATION_MAX + 1);
   SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata);
 
   if (hasVideo()) {
     DCHECK(!video_weblayer_);
     scoped_refptr<cc::VideoLayer> layer =
         cc::VideoLayer::Create(compositor_, pipeline_metadata_.video_rotation);
 
     if (pipeline_metadata_.video_rotation == VIDEO_ROTATION_90 ||
         pipeline_metadata_.video_rotation == VIDEO_ROTATION_270) {
@@ skipping 13 matching lines @@
 
   // Ignore buffering state changes until we've completed all outstanding seeks.
   if (seeking_ || pending_seek_)
     return;
 
   // TODO(scherkus): Handle other buffering states when Pipeline starts using
   // them and translate them ready state changes http://crbug.com/144683
   DCHECK_EQ(buffering_state, BUFFERING_HAVE_ENOUGH);
   SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);
 
+  // If we were only tasked to preload and a play request hasn't come in yet,
+  // cancel the DataSource once it reaches the deferred state if it isn't
+  // already. Subsequent play requests will restart the DataSource.
+  if (preload_ == BufferedDataSource::METADATA && data_source_ &&
+      !data_source_->IsStreaming() && !data_source_->media_has_played()) {
+    data_source_->CancelUponDeferral();
+  }

[xhwang, 2015/03/26 07:21:55]

Seems like |data_source_| knows the preload type, IsStreaming() and
media_has_played(), can we move these logic to |data_source_|?

e.g.

if (data_source_)
  data_source_->OnBufferingHaveEnough();

[DaleCurtis, 2015/03/26 17:22:00]

Great idea!

+
   // Blink expects a timeChanged() in response to a seek().
   if (should_notify_time_changed_)
     client_->timeChanged();
 }
 
 void WebMediaPlayerImpl::OnDemuxerOpened() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   client_->mediaSourceOpened(new WebMediaSourceImpl(
       chunk_demuxer_, base::Bind(&LogMediaSourceError, media_log_)));
 }
@@ skipping 198 matching lines @@
 
   // pause() may be called after playback has ended and the HTMLMediaElement
   // requires that currentTime() == duration() after ending.  We want to ensure
   // |paused_time_| matches currentTime() in this case or a future seek() may
   // incorrectly discard what it thinks is a seek to the existing time.
   paused_time_ =
       ended_ ? pipeline_.GetMediaDuration() : pipeline_.GetMediaTime();
 }
 
 }  // namespace media