Disable idle suspend for Chromecast

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 186 matching lines @@
           BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnOpacityChanged))),
       is_cdm_attached_(false),
 #if defined(OS_ANDROID)  // WMPI_CAST
       cast_impl_(this, client_, params.context_3d_cb()),
 #endif
       volume_(1.0),
       volume_multiplier_(1.0),
       renderer_factory_(std::move(renderer_factory)),
       surface_manager_(params.surface_manager()),
       suppress_destruction_errors_(false),
-      can_suspend_state_(CanSuspendState::UNKNOWN) {
+      can_suspend_state_(params.allow_idle_suspend() ? CanSuspendState::UNKNOWN
+                                                     : CanSuspendState::NO) {
   DCHECK(!adjust_allocated_memory_cb_.is_null());
   DCHECK(renderer_factory_);
   DCHECK(client_);
 
   if (delegate_)
     delegate_id_ = delegate_->AddObserver(this);
 
   media_log_->AddEvent(
       media_log_->CreateEvent(MediaLogEvent::WEBMEDIAPLAYER_CREATED));
 
@@ skipping 1227 matching lines @@
     ReportMemoryUsage();
   }
 }
 
 void WebMediaPlayerImpl::SetSuspendState(bool is_suspended) {
   // Do not change the state after an error has occurred.
   // TODO(sandersd): Update PipelineController to remove the need for this.
   if (IsNetworkStateError(network_state_))
     return;
 
+  if (can_suspend_state_ == CanSuspendState::NO)
+    return;
+
 #if defined(OS_MACOSX) || defined(OS_WIN)
   // TODO(sandersd): Idle suspend is disabled on OSX and Windows for hardware
   // decoding / opaque video frames since these frames are owned by the decoder
   // in the GPU process. http://crbug.com/595716 and http://crbug.com/602708
   if (can_suspend_state_ == CanSuspendState::UNKNOWN) {
     scoped_refptr<VideoFrame> frame = GetCurrentFrameFromCompositor();
     if (frame) {
       can_suspend_state_ =
           frame->metadata()->IsTrue(VideoFrameMetadata::DECODER_OWNS_FRAME)
               ? CanSuspendState::NO
               : CanSuspendState::YES;
     }
   }
 #else
   can_suspend_state_ = CanSuspendState::YES;
 #endif
 
-  if (can_suspend_state_ == CanSuspendState::NO)

[sandersd (OOO until July 31), 2016/05/12 17:48:11]

Still need this here due to line 1468.

[halliwell, 2016/05/12 18:11:59]

Doh, yes.  Done.

-    return;
-
   if (is_suspended) {
     pipeline_controller_.Suspend();
   } else {
     pipeline_controller_.Resume();
   }
 }
 
 WebMediaPlayerImpl::PlayState
 WebMediaPlayerImpl::UpdatePlayState_ComputePlayState(bool is_remote,
                                                      bool is_backgrounded) {
@@ skipping 107 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