Add external surface rendering mode

webkit/media/android/webmediaplayer_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_android.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "media/base/android/media_player_bridge.h"
 #include "net/base/mime_util.h"
@@ skipping 24 matching lines @@
       main_loop_(MessageLoop::current()),
       pending_seek_(0),
       seeking_(false),
       did_loading_progress_(false),
       manager_(manager),
       network_state_(WebMediaPlayer::NetworkStateEmpty),
       ready_state_(WebMediaPlayer::ReadyStateHaveNothing),
       is_playing_(false),
       needs_establish_peer_(true),
       has_size_info_(false),
+      is_in_video_view_(false),
       stream_texture_factory_(factory) {
   main_loop_->AddDestructionObserver(this);
   if (manager_)
     player_id_ = manager_->RegisterMediaPlayer(this);
 
   if (stream_texture_factory_.get()) {
     stream_texture_proxy_.reset(stream_texture_factory_->CreateProxy());
     stream_id_ = stream_texture_factory_->CreateStreamTexture(&texture_id_);
     ReallocateVideoFrame();
   }
@@ skipping 314 matching lines @@
   video_frame_.reset();
 
   if (manager_)
     manager_->UnregisterMediaPlayer(player_id_);
 
   manager_ = NULL;
   main_loop_ = NULL;
 }
 
 void WebMediaPlayerAndroid::ReallocateVideoFrame() {
-  if (texture_id_) {
-    video_frame_.reset(new WebVideoFrameImpl(VideoFrame::WrapNativeTexture(
-        texture_id_, kGLTextureExternalOES, natural_size_,
-        gfx::Rect(natural_size_), natural_size_, base::TimeDelta(),
-        VideoFrame::ReadPixelsCB(),
-        base::Closure())));
+  unsigned int texture_id = texture_id_;

[qinmin, 2012/12/17 19:34:06]

you also want to change the ctor of this class, to remove the calls to
stream_texture related stuff. Unless you want to support both surfaceview and
surface texture for video at the same time.

[wonsik2, 2013/02/14 14:56:38]

I think it might make sense to support them both at the same time. I'll keep the
ctor code for now.

+  if (is_in_video_view_) {
+    texture_id = 0;
+  } else if (texture_id_ == 0) {
+    return;
   }
+  video_frame_.reset(new WebVideoFrameImpl(VideoFrame::WrapNativeTexture(
+      texture_id, kGLTextureExternalOES, natural_size_,
+      gfx::Rect(natural_size_), natural_size_, base::TimeDelta(),
+      VideoFrame::ReadPixelsCB(),
+      base::Closure())));
 }
 
 WebVideoFrame* WebMediaPlayerAndroid::getCurrentFrame() {
   if (stream_texture_proxy_.get() && !stream_texture_proxy_->IsInitialized()
       && stream_id_) {
     stream_texture_proxy_->Initialize(
         stream_id_, video_frame_->width(), video_frame_->height());
   }
 
   return video_frame_.get();
@@ skipping 12 matching lines @@
 void WebMediaPlayerAndroid::EstablishSurfaceTexturePeer() {
   if (stream_texture_factory_.get() && stream_id_)
     stream_texture_factory_->EstablishPeer(stream_id_, player_id_);
   needs_establish_peer_ = false;
 }
 
 void WebMediaPlayerAndroid::SetNeedsEstablishPeer(bool needs_establish_peer) {
   needs_establish_peer_ = needs_establish_peer;
 }
 
+void WebMediaPlayerAndroid::SetIsInVideoView(bool is_in_video_view) {
+  is_in_video_view_ = is_in_video_view;;
+  ReallocateVideoFrame();
+}
+
 void WebMediaPlayerAndroid::UpdatePlayingState(bool is_playing) {
   is_playing_ = is_playing;
 }
 
 }  // namespace webkit_media