Upstream implementation for embedded video for WebMediaPlayerAndroid

webkit/media/android/webmediaplayer_android.h

 // 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.
 
 #ifndef WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/basictypes.h"
 #include "base/message_loop_proxy.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
 
 namespace WebKit {
 class WebCookieJar;
 }
 
 namespace media {
 class MediaPlayerBridge;
 }
 
 namespace webkit_media {
 
+class StreamTextureFactory;
+class StreamTextureProxy;
+class WebMediaPlayerManagerAndroid;
 class WebMediaPlayerProxyAndroid;
 
 // This class serves as the android implementation of WebKit::WebMediaPlayer.
 // It implements all the playback functions by forwarding calls to android
 // media player, and reports player state changes to the webkit.
 class WebMediaPlayerAndroid :
     public WebKit::WebMediaPlayer,
     public base::SupportsWeakPtr<WebMediaPlayerAndroid> {
  public:
   WebMediaPlayerAndroid(WebKit::WebMediaPlayerClient* client,
-                        WebKit::WebCookieJar* cookie_jar);
+                        WebKit::WebCookieJar* cookie_jar,
+                        webkit_media::WebMediaPlayerManagerAndroid* manager,
+                        webkit_media::StreamTextureFactory* factory);
   virtual ~WebMediaPlayerAndroid() OVERRIDE;
 
   // Set |incognito_mode_| to true if in incognito mode.
   static void InitIncognito(bool incognito_mode);
 
   // Resource loading.
   virtual void load(const WebKit::WebURL& url) OVERRIDE;
   virtual void cancelLoad() OVERRIDE;
 
   // Playback controls.
@@ skipping 47 matching lines @@
   // Provide statistics.
   virtual unsigned decodedFrameCount() const OVERRIDE;
   virtual unsigned droppedFrameCount() const OVERRIDE;
   virtual unsigned audioDecodedByteCount() const OVERRIDE;
   virtual unsigned videoDecodedByteCount() const OVERRIDE;
 
   // Methods called from VideoLayerChromium. These methods are running on the
   // compositor thread.
   virtual WebKit::WebVideoFrame* getCurrentFrame() OVERRIDE;
   virtual void putCurrentFrame(WebKit::WebVideoFrame*) OVERRIDE;
+  virtual void setStreamTextureClient(
+      WebKit::WebStreamTextureClient* client) OVERRIDE;
 
   // Media player callback handlers.
   void OnMediaPrepared();
   void OnPlaybackComplete();
   void OnBufferingUpdate(int percentage);
   void OnSeekComplete();
   void OnMediaError(int error_type);
   void OnMediaInfo(int info_type);
   void OnVideoSizeChanged(int width, int height);
 
+  // This function is called by WebMediaPlayerManagerAndroid to pause the video
+  // and release |media_player_| and its surface texture when we switch tabs.
+  // However, the actual GlTexture is not released to keep the video screenshot.
+  void ReleaseMediaResources();
+
   // Method to set the video surface for android media player.
   void SetVideoSurface(jobject j_surface);

[scherkus (not reviewing), 2012/05/25 22:01:46]

if it's possible could you try to not include methods/variables that aren't used
yet?

I understand it's probably really tricky but it makes it awfully confusing for
me to figure out what's going on!

[qinmin, 2012/05/26 00:37:42]

This function is removed from this class, will upstream it later when we
upstream the RendererMainPlatformDelegate.

On 2012/05/25 22:01:46, scherkus wrote:

 
  private:
   // Create a media player to load the |url_| and prepare for playback.
   // Because of limited decoding resources on mobile devices, idle media players
   // could get released. In that case, we call this function to get a new media
   // player when needed.
   void InitializeMediaPlayer();
 
   // Functions that implements media player control.
   void PlayInternal();
   void PauseInternal();
   void SeekInternal(float seconds);
 
   // Helper methods for posting task for setting states and update WebKit.
   void UpdateNetworkState(WebKit::WebMediaPlayer::NetworkState state);
   void UpdateReadyState(WebKit::WebMediaPlayer::ReadyState state);
 
+  // Methods for creation and deletion of stream texture.
+  void CreateStreamTexture();
+  void DestroyStreamTexture();
+
   // whether the current process is incognito mode
   static bool incognito_mode_;
 
   WebKit::WebMediaPlayerClient* const client_;
 
   // Save the list of buffered time ranges.
   WebKit::WebTimeRanges buffered_;
 
   // Bridge to the android media player.
   scoped_ptr<media::MediaPlayerBridge> media_player_;
@@ skipping 31 matching lines @@
 
   // Whether playback has completed.
   float playback_completed_;
 
   // Fake it by self increasing on every OnBufferingUpdate event.
   int64 buffered_bytes_;
 
   // Pointer to the cookie jar to get the cookie for the media url.
   WebKit::WebCookieJar* cookie_jar_;
 
+  // Manager for managing this media player.
+  webkit_media::WebMediaPlayerManagerAndroid* manager_;
+
+  // Player ID assigned by the media player manager.
+  int player_id_;
+
   // Whether the user has clicked the play button while media player
   // is preparing.
   bool pending_play_event_;
 
   // Current player states.
   WebKit::WebMediaPlayer::NetworkState network_state_;
   WebKit::WebMediaPlayer::ReadyState ready_state_;
 
+  // GL texture ID allocated to the video.
+  unsigned int texture_id_;
+
+  // Stream texture ID allocated to the video.
+  unsigned int stream_id_;
+
+  // Whether |media_player_| needs to re-establish the surface texture peer.
+  bool needs_establish_peer_;
+
+  // Object for allocating stream textures.
+  scoped_ptr<webkit_media::StreamTextureFactory> stream_texture_factory_;
+
+  // Object for calling back the compositor thread to repaint the video when a
+  // frame available. It should be initialized on the compositor thread.
+  scoped_ptr<webkit_media::StreamTextureProxy> stream_texture_proxy_;
+
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_