Don't suspend before there is metadata.

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 967 matching lines @@
     if (pipeline_metadata_.video_rotation == VIDEO_ROTATION_90 ||
         pipeline_metadata_.video_rotation == VIDEO_ROTATION_270) {
       gfx::Size size = pipeline_metadata_.natural_size;
       pipeline_metadata_.natural_size = gfx::Size(size.height(), size.width());
     }
 
     video_weblayer_.reset(new cc_blink::WebLayerImpl(layer));
     video_weblayer_->layer()->SetContentsOpaque(opaque_);
     video_weblayer_->SetContentsOpaqueIsFixed(true);
     client_->setWebLayer(video_weblayer_.get());
-
-    // If there is video and the frame is hidden, then it may be time to suspend
-    // playback.
-    if (delegate_ && delegate_->IsHidden())
-      OnHidden();
   }
 
   // Tell the delegate we can now be safely suspended due to inactivity if a
   // subsequent play event does not occur.
   if (paused_)
     NotifyPlaybackPaused();
+
+  // If the frame is hidden, it may be time to suspend playback.
+  if (delegate_ && delegate_->IsHidden())
+    OnHidden();
 }
 
 void WebMediaPlayerImpl::OnPipelineBufferingStateChanged(
     BufferingState buffering_state) {
   DVLOG(1) << __FUNCTION__ << "(" << buffering_state << ")";
 
   // Ignore buffering state changes until we've completed all outstanding
   // operations.
   if (!pipeline_controller_.IsStable())
     return;
@@ skipping 50 matching lines @@
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   if (!IsSuspendUponHiddenEnabled())
     return;
 
 #if defined(OS_ANDROID)  // WMPI_CAST
   // If we're remote, the pipeline should already be suspended.
   if (isRemote())
     return;
 #endif
 
+  // Don't suspend before metadata is available, as we don't know if there is a
+  // video track yet.
+  if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata)
+    return;
+
   // 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;
 
 #if defined(OS_ANDROID)  // WMPI_CAST
   // If we're remote, the pipeline should stay suspended.
   if (isRemote())
     return;
 #endif
 
-  if (!ended_ && !paused_)
+  // If we do not yet have metadata, the only way we could have been suspended
+  // is by a OnSuspendRequested() with |must_suspend| set. In that case we need
+  // to resume, otherwise playback will be broken.
+  //
+  // Otherwise, resume if we should be playing.
+  if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata ||
+      (!ended_ && !paused_)) {
     pipeline_controller_.Resume();
+  }
 }
 
 void WebMediaPlayerImpl::OnSuspendRequested(bool must_suspend) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
 #if defined(OS_ANDROID)  // WMPI_CAST
   // If we're remote, the pipeline should already be suspended.
   if (isRemote())
     return;
 #endif
@@ skipping 405 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