Fix fullscreen video bugs on TV

content/renderer/media/android/webmediaplayer_android.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 "content/renderer/media/android/webmediaplayer_android.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 274 matching lines @@
   has_media_info_ = true;
   if (has_media_metadata_ &&
       ready_state_ != WebMediaPlayer::ReadyStateHaveEnoughData) {
     UpdateReadyState(WebMediaPlayer::ReadyStateHaveMetadata);
     UpdateReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);
   }
 }
 
 void WebMediaPlayerAndroid::play() {
 #if defined(GOOGLE_TV)
-  if (hasVideo() && needs_external_surface_) {
+  if (hasVideo() && needs_external_surface_ &&
+      !manager_->IsInFullscreen(frame_)) {
     DCHECK(!needs_establish_peer_);
     proxy_->RequestExternalSurface(player_id_, last_computed_rect_);
   }
   if (audio_renderer_ && paused())
     audio_renderer_->Play();
 #endif
   if (hasVideo() && needs_establish_peer_)
     EstablishSurfaceTexturePeer();
 
   if (paused())
@@ skipping 311 matching lines @@
   has_size_info_ = true;
   if (natural_size_.width == width && natural_size_.height == height)
     return;
 
 #if defined(GOOGLE_TV)
   if ((external_surface_threshold_ >= 0 &&
        external_surface_threshold_ <= width * height) ||
       // Use H/W surface for MSE as the content is protected.
       media_source_delegate_) {
     needs_external_surface_ = true;
-    if (!paused())
+    if (!paused() && !manager_->IsInFullscreen(frame_))
       proxy_->RequestExternalSurface(player_id_, last_computed_rect_);
   } else if (stream_texture_factory_ && !stream_texture_proxy_) {
     // Do deferred stream texture creation finally.
     if (paused()) {
       stream_id_ = stream_texture_factory_->CreateStreamTexture(
           kGLTextureExternalOES,
           &texture_id_,
           &texture_mailbox_,
           &texture_mailbox_sync_point_);
       SetNeedsEstablishPeer(true);
@@ skipping 22 matching lines @@
 
 void WebMediaPlayerAndroid::OnDidExitFullscreen() {
   // |needs_external_surface_| is always false on non-TV devices.
   if (!needs_external_surface_)
     SetNeedsEstablishPeer(true);
   // We had the fullscreen surface connected to Android MediaPlayer,
   // so reconnect our surface texture for embedded playback.
   if (!paused() && needs_establish_peer_)
     EstablishSurfaceTexturePeer();
 
+#if defined(GOOGLE_TV)
+  if (!paused() && needs_external_surface_)
+    proxy_->RequestExternalSurface(player_id_, last_computed_rect_);
+#endif
+
   frame_->view()->willExitFullScreen();
   frame_->view()->didExitFullScreen();
   manager_->DidExitFullscreen();
   client_->repaint();
 }
 
 void WebMediaPlayerAndroid::OnMediaPlayerPlay() {
   UpdatePlayingState(true);
   client_->playbackStateChanged();
 }
@@ skipping 477 matching lines @@
 
 void WebMediaPlayerAndroid::exitFullscreen() {
   proxy_->ExitFullscreen(player_id_);
 }
 
 bool WebMediaPlayerAndroid::canEnterFullscreen() const {
   return manager_->CanEnterFullscreen(frame_);
 }
 
 }  // namespace content