Add external surface rendering mode

webkit/media/android/webmediaplayer_impl_android.cc

 // Copyright (c) 2012 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 "webkit/media/android/webmediaplayer_impl_android.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "media/base/android/media_player_bridge.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/media/android/stream_texture_factory_android.h"
 #include "webkit/media/android/webmediaplayer_manager_android.h"
 #include "webkit/media/android/webmediaplayer_proxy_android.h"
 
 using WebKit::WebMediaPlayerClient;
 using WebKit::WebMediaPlayer;
 
 namespace webkit_media {
 
+namespace {
+
+// Copied from content/browser/android/content_video_view.h
+enum {
+  // These are used in java so don't change them unless we can share an enum
+  // from java and remove this enum.
+  PERSONALITY_FULL_SCREEN = 0,
+  PERSONALITY_EMBEDDED    = 1,
+};
+
+}  // namespace
+
 WebMediaPlayerImplAndroid::WebMediaPlayerImplAndroid(
     WebKit::WebFrame* frame,
     WebMediaPlayerClient* client,
     WebMediaPlayerManagerAndroid* manager,
     WebMediaPlayerProxyAndroid* proxy,
     StreamTextureFactory* factory)
     : WebMediaPlayerAndroid(client, manager, factory),
       frame_(frame),
       proxy_(proxy),
       current_time_(0) {
@@ skipping 53 matching lines @@
 
 void WebMediaPlayerImplAndroid::ReleaseResourcesInternal() {
   if (proxy_)
     proxy_->ReleaseResources(player_id());
 }
 
 void WebMediaPlayerImplAndroid::OnTimeUpdate(base::TimeDelta current_time) {
   current_time_ = static_cast<float>(current_time.InSecondsF());
 }
 
-void WebMediaPlayerImplAndroid::OnDidEnterFullscreen() {
-  if (!manager()->IsInFullscreen(frame_)) {
-    frame_->view()->willEnterFullScreen();
-    frame_->view()->didEnterFullScreen();
-    manager()->DidEnterFullscreen(frame_);
+void WebMediaPlayerImplAndroid::OnDidEnterVideoView(int personality) {
+  if (personality == PERSONALITY_FULL_SCREEN) {
+    if (!manager()->IsInFullscreen(frame_)) {
+      frame_->view()->willEnterFullScreen();
+      frame_->view()->didEnterFullScreen();
+      manager()->DidEnterFullscreen(frame_);
+    }
+  } else {
+    SetIsInVideoView(true);
+    SetNeedsEstablishPeer(false);
   }
 }
 
-void WebMediaPlayerImplAndroid::OnDidExitFullscreen() {
+void WebMediaPlayerImplAndroid::OnDidExitVideoView(int personality) {
   SetNeedsEstablishPeer(true);
   // We had the fullscreen surface connected to Android MediaPlayer,
   // so reconnect our surface texture for embedded playback.
   if (!paused())
     EstablishSurfaceTexturePeer();
 
-  frame_->view()->willExitFullScreen();
-  frame_->view()->didExitFullScreen();
-  manager()->DidExitFullscreen();
-  client()->repaint();
+  if (personality == PERSONALITY_FULL_SCREEN) {
+    frame_->view()->willExitFullScreen();
+    frame_->view()->didExitFullScreen();
+    manager()->DidExitFullscreen();
+    client()->repaint();
+  } else {
+    SetIsInVideoView(false);
+  }
 }
 
 void WebMediaPlayerImplAndroid::OnMediaPlayerPlay() {
   UpdatePlayingState(true);
   client()->playbackStateChanged();
 }
 
 void WebMediaPlayerImplAndroid::OnMediaPlayerPause() {
   UpdatePlayingState(false);
   client()->playbackStateChanged();
 }
 
 void WebMediaPlayerImplAndroid::Destroy() {
   proxy_ = NULL;
 }
 
 void WebMediaPlayerImplAndroid::SetVideoSurface(jobject j_surface) {}
 
 }  // namespace webkit_media