Turn off video overlay on android for rotated video.

media/blink/webmediaplayer_impl.cc

Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 654ba89050299e2a31ec49243c759482815edc6c..d6bd57d5a3aeebc9b7ece296e6c1aef7eb1aa409 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -346,14 +346,15 @@ void WebMediaPlayerImpl::DisableOverlay() {
 }
 
 void WebMediaPlayerImpl::enteredFullscreen() {
-  if (!force_video_overlays_ && enable_fullscreen_video_overlays_)
+  if (!force_video_overlays_ && enable_fullscreen_video_overlays_ &&
+      DoesOverlaySupportMetadata())

[watk, 2017/01/03 20:33:03]

needs braces now

[liberato (no reviews please), 2017/01/03 22:53:45]

Done.

     EnableOverlay();
   if (observer_)
     observer_->OnEnteredFullscreen();
 }
 
 void WebMediaPlayerImpl::exitedFullscreen() {
-  if (!force_video_overlays_ && enable_fullscreen_video_overlays_)
+  if (overlay_enabled_)

[watk, 2017/01/03 20:33:02]

I don't think we should do this when force_video_overlays_?

[liberato (no reviews please), 2017/01/03 22:53:45]

good catch.  not sure why i thought that was okay.  added a comment too.

     DisableOverlay();
   if (observer_)
     observer_->OnExitedFullscreen();
@@ -1155,8 +1156,14 @@ void WebMediaPlayerImpl::OnMetadata(PipelineMetadata metadata) {
     pipeline_metadata_.natural_size = GetRotatedVideoSize(
         pipeline_metadata_.video_rotation, pipeline_metadata_.natural_size);
 
-    if (overlay_enabled_ && surface_manager_)
-      surface_manager_->NaturalSizeChanged(pipeline_metadata_.natural_size);
+    if (overlay_enabled_) {
+      // SurfaceView doesn't support rotated video, so transition back if
+      // the video is now rotated.
+      if (!DoesOverlaySupportMetadata())
+        DisableOverlay();

[watk, 2017/01/03 20:33:03]

I don't think we should do this for force_video_overlays_ either.

[liberato (no reviews please), 2017/01/03 22:53:45]

yeah, though we're kinda going to be wrong either way.  probably better to be
wrong and keep the state machine working, though.

Done, plus comment.

+      else if (surface_manager_)
+        surface_manager_->NaturalSizeChanged(pipeline_metadata_.natural_size);
+    }
 
     DCHECK(!video_weblayer_);
     video_weblayer_.reset(new cc_blink::WebLayerImpl(cc::VideoLayer::Create(
@@ -2011,6 +2018,10 @@ bool WebMediaPlayerImpl::IsHidden() const {
   return delegate_ && delegate_->IsHidden();
 }
 
+bool WebMediaPlayerImpl::DoesOverlaySupportMetadata() const {
+  return pipeline_metadata_.video_rotation == VIDEO_ROTATION_0;
+}
+
 void WebMediaPlayerImpl::ActivateViewportIntersectionMonitoring(bool activate) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());