Suspend idle WebMediaPlayer instances after some time.

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 330 matching lines @@
 #endif
 
   paused_ = false;
   pipeline_.SetPlaybackRate(playback_rate_);
 
   if (data_source_)
     data_source_->MediaIsPlaying();
 
   media_log_->AddEvent(media_log_->CreateEvent(MediaLogEvent::PLAY));
 
-  if (playback_rate_ > 0)
-    NotifyPlaybackStarted();
+  if (playback_rate_ > 0) {
+    // Resume the player if playback was initiated in the foreground. Resume()
+    // will do nothing if the pipeline is not suspended state, but will clear
+    // some internal pending state, so it should always be called.
+    const bool was_suspended = pipeline_controller_.IsSuspended();
+    if (delegate_ && !delegate_->IsHidden())
+      pipeline_controller_.Resume();
+
+    // If we were in the suspended state, OnPipelineResumed() will take care of
+    // NotifyPlaybackStarted() when it finishes.
+    if (!was_suspended)
+      NotifyPlaybackStarted();

[sandersd (OOO until July 31), 2016/02/27 00:22:20]

If you swap the order, then no test is needed because this will be a no-op while
suspended.

[DaleCurtis, 2016/02/27 00:55:23]

Done.

+  }
 }
 
 void WebMediaPlayerImpl::pause() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   const bool was_already_paused = paused_ || playback_rate_ == 0;
   paused_ = true;
 
 #if defined(OS_ANDROID)  // WMPI_CAST
@@ skipping 65 matching lines @@
                      AsWeakPtr(), BUFFERING_HAVE_ENOUGH));
     }
     return;
   }
 
   seeking_ = true;
   seek_time_ = time;
   if (paused_)
     paused_time_ = time;
   pipeline_controller_.Seek(time, time_updated);
+
+  // Resume the pipeline if the seek is initiated in the foreground so that
+  // the correct frame is displayed. If the pipeline is not suspended, Resume()
+  // will do nothing but clear some pending state -- thus always call it.
+  if (delegate_ && !delegate_->IsHidden())
+    pipeline_controller_.Resume();
 }
 
 void WebMediaPlayerImpl::setRate(double rate) {
   DVLOG(1) << __FUNCTION__ << "(" << rate << ")";
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   // TODO(kylep): Remove when support for negatives is added. Also, modify the
   // following checks so rewind uses reasonable values also.
   if (rate < 0.0)
     return;
@@ skipping 872 matching lines @@
                                     base::Bind(&GetCurrentFrameAndSignal,
                                                base::Unretained(compositor_),
                                                &video_frame,
                                                &event));
   event.Wait();
   return video_frame;
 }
 
 void WebMediaPlayerImpl::NotifyPlaybackStarted() {
 #if defined(OS_ANDROID)  // WMPI_CAST
-  // We do not tell our delegates about remote playback, becuase that would
+  // We do not tell our delegates about remote playback, because that would
   // keep the device awake, which is not what we want.
   if (isRemote())
     return;
 #endif
 
   // NotifyPlaybackStarted() may be called by interactions while suspended,
   // (play/pause in particular). Those actions won't have any effect until the
   // pipeline is resumed.
   // TODO(dalecurtis): Should these be dropped at the call sites instead?
   // Alternatively, rename this method to include Maybe or Changed, and handle
@@ skipping 61 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