Disable "pause-and-buffer" on Android, cancel suspended players.

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 <cmath>
 #include <limits>
 #include <string>
@@ skipping 519 matching lines @@
 STATIC_ASSERT_ENUM(WebMediaPlayer::BufferingStrategy::Normal,
                    BufferedDataSource::BUFFERING_STRATEGY_NORMAL);
 STATIC_ASSERT_ENUM(WebMediaPlayer::BufferingStrategy::Aggressive,
                    BufferedDataSource::BUFFERING_STRATEGY_AGGRESSIVE);
 
 void WebMediaPlayerImpl::setBufferingStrategy(
     WebMediaPlayer::BufferingStrategy buffering_strategy) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
+#if defined(OS_ANDROID)
+  // We disallow aggressive buffering on Android since it matches the behavior
+  // of the platform media player and may have data usage penalties.
+  // TODO(dalecurtis, hubbe): We should probably stop using "pause-and-buffer"
+  // everywhere. See http://crbug.com/594669 for more details.
+  buffering_strategy_ = BufferedDataSource::BUFFERING_STRATEGY_NORMAL;
+#else
   buffering_strategy_ =
       static_cast<BufferedDataSource::BufferingStrategy>(buffering_strategy);
+#endif
+
   if (data_source_)
     data_source_->SetBufferingStrategy(buffering_strategy_);
 }
 
 bool WebMediaPlayerImpl::hasVideo() const {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   return pipeline_metadata_.has_video;
 }
 
@@ skipping 314 matching lines @@
     scoped_refptr<VideoFrame> frame = cast_impl_.GetCastingBanner();
     if (frame) {
       compositor_->PaintFrameUsingOldRenderingPath(frame);
     }
   }
 #endif
 
   memory_usage_reporting_timer_.Stop();
   ReportMemoryUsage();
 
+  // If we're not in an aggressive buffering state, tell the data source we have
+  // enough data so that it may release the connection.
+  if (buffering_strategy_ !=
+      BufferedDataSource::BUFFERING_STRATEGY_AGGRESSIVE) {
+    data_source_->OnBufferingHaveEnough(true);
+  }
+
   if (pending_suspend_resume_cycle_) {
     pending_suspend_resume_cycle_ = false;
     pipeline_controller_.Resume();
     return;
   }
 }
 
 void WebMediaPlayerImpl::OnPipelineResumed() {
   if (playback_rate_ > 0 && !paused_) {
     NotifyPlaybackStarted();
@@ skipping 79 matching lines @@
     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);
 
   // Let the DataSource know we have enough data. It may use this information to
   // release unused network connections.
   if (data_source_)
-    data_source_->OnBufferingHaveEnough();
+    data_source_->OnBufferingHaveEnough(false);
 
   // Blink expects a timeChanged() in response to a seek().
   if (should_notify_time_changed_)
     client_->timeChanged();
 
   // Once we have enough, start reporting the total memory usage. We'll also
   // report once playback starts.
   ReportMemoryUsage();
 }
 
@@ skipping 37 matching lines @@
     return;
 #endif
 
   // Don't suspend players which only have audio and have not completed
   // playback. The user can still control these players via the MediaSession UI.
   // If the player has never started playback, OnSuspendRequested() will handle
   // release of any idle resources.
   if (!hasVideo() && !paused_ && !ended_)
     return;
 
+  // Always reset the buffering strategy to normal when suspending for hidden to
+  // prevent an idle network connection from lingering.
+  setBufferingStrategy(WebMediaPlayer::BufferingStrategy::Normal);
   pipeline_controller_.Suspend();
   if (delegate_)
     delegate_->PlayerGone(delegate_id_);
 }
 
 void WebMediaPlayerImpl::OnShown() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   if (!IsSuspendUponHiddenEnabled())
     return;
 
@@ skipping 416 matching lines @@
 bool WebMediaPlayerImpl::IsAutomaticResumeAllowed() {
 #if defined(OS_ANDROID)
   return !hasVideo() || (delegate_ && !delegate_->IsHidden());
 #else
   // On non-Android platforms Resume() is always allowed.
   return true;
 #endif
 }
 
 }  // namespace media