media: Cancel any pending pipeline restart when the player is hidden

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 1123 matching lines @@
           switches::kDisableMediaSuspend)) {
     return;
   }
 
 #if defined(OS_ANDROID)
   // If we're remote, the pipeline should already be suspended.
   if (isRemote())
     return;
 #endif
 
-  if (must_suspend || (paused_ && ended_) || hasVideo())
+  if (must_suspend || (paused_ && ended_) || hasVideo()) {
+    // If we're in the middle of a suspend/resume cycle we no longer want to
+    // resume when the suspend completes.
+    pending_suspend_resume_cycle_ = false;
     ScheduleSuspend();
+  }
 }
 
 void WebMediaPlayerImpl::ScheduleSuspend() {
   if (!pipeline_.IsRunning())
     return;
 
   // Always reset the buffering strategy to normal when suspending for hidden to
   // prevent an idle network connection from lingering.
   setBufferingStrategy(WebMediaPlayer::BufferingStrategy::Normal);
   if (resuming_ || seeking_) {
@@ skipping 488 matching lines @@
            << ", Video: " << stats.video_memory_usage << ", DataSource: "
            << (data_source_ ? data_source_->GetMemoryUsage() : 0)
            << ", Demuxer: " << demuxer_memory_usage;
 
   const int64_t delta = current_memory_usage - last_reported_memory_usage_;
   last_reported_memory_usage_ = current_memory_usage;
   adjust_allocated_memory_cb_.Run(delta);
 }
 
 }  // namespace media