Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(879)

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 18081003: Fix fullscreen video bugs on TV (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/android/media_player_manager_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/android/webmediaplayer_android.cc
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index cc8c2e9ff2dd21b36984e80078005505befb0fe0..b3781d4e88712596904b227f6510da7e5e8ccc5a 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -292,7 +292,8 @@ void WebMediaPlayerAndroid::DidLoadMediaInfo(
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_);
}
@@ -624,7 +625,7 @@ void WebMediaPlayerAndroid::OnVideoSizeChanged(int width, int 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.
@@ -667,6 +668,11 @@ void WebMediaPlayerAndroid::OnDidExitFullscreen() {
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();
« no previous file with comments | « content/browser/android/media_player_manager_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698