media: Optimize HW Video to 2D Canvas copy.

content/renderer/media/android/webmediaplayer_android.h

 // Copyright 2013 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 CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 
 #include <jni.h>
 #include <string>
 #include <vector>
@@ skipping 10 matching lines @@
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/renderer/media/android/media_info_loader.h"
 #include "content/renderer/media/android/media_source_delegate.h"
 #include "content/renderer/media/android/stream_texture_factory.h"
 #include "content/renderer/media/crypto/proxy_decryptor.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "media/base/android/media_player_android.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/media_keys.h"
 #include "media/base/time_delta_interpolator.h"
-#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
+#include "media/filters/skcanvas_video_renderer.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/gpu/GrContext.h"
-#include "third_party/skia/include/gpu/SkGrPixelRef.h"
 #include "ui/gfx/rect_f.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace blink {
 class WebContentDecryptionModule;
 class WebContentDecryptionModuleResult;
 class WebFrame;
+class WebGraphicsContext3D;
 class WebURL;
 }
 
 namespace cc_blink {
 class WebLayerImpl;
 }
 
 namespace gpu {
 struct MailboxHolder;
 }
@@ skipping 53 matching lines @@
   virtual void setVolume(double volume);
   virtual void requestRemotePlayback();
   virtual void requestRemotePlaybackControl();
   virtual blink::WebTimeRanges buffered() const;
   virtual blink::WebTimeRanges seekable() const;
 
   // Poster image, as defined in the <video> element.
   virtual void setPoster(const blink::WebURL& poster) override;
 
   // Methods for painting.
-  // FIXME: This path "only works" on Android. It is a workaround for the
-  // issue that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES texture
-  // internally. It should be removed and replaced by the normal paint path.
-  // https://code.google.com/p/skia/issues/detail?id=1189

[dshwang, 2014/10/13 17:07:42]

Remove the stale comment. Currently, blink uses WebMediaPlayerAndroid::Paint in
the same way to WebMediaPlayer(Impl|MS)::Paint

   virtual void paint(blink::WebCanvas* canvas,
                      const blink::WebRect& rect,
                      unsigned char alpha,
                      SkXfermode::Mode mode);
   // TODO(dshwang): remove it because above method replaces. crbug.com/401027
   virtual void paint(blink::WebCanvas* canvas,
                      const blink::WebRect& rect,
                      unsigned char alpha);
 
   virtual bool copyVideoTextureToPlatformTexture(
@@ skipping 184 matching lines @@
   // If |decryptor_ready_cb| is null, the existing callback will be fired with
   // NULL immediately and reset.
   void SetDecryptorReadyCB(const media::DecryptorReadyCB& decryptor_ready_cb);
 
   // Called when the ContentDecryptionModule has been attached to the
   // pipeline/decoders.
   void ContentDecryptionModuleAttached(
       blink::WebContentDecryptionModuleResult result,
       bool success);
 
-  bool EnsureTextureBackedSkBitmap(GrContext* gr, SkBitmap& bitmap,
-                                   const blink::WebSize& size,
-                                   GrSurfaceOrigin origin,
-                                   GrPixelConfig config);
-
   bool IsHLSStream() const;
 
   blink::WebFrame* const frame_;
 
   blink::WebMediaPlayerClient* const client_;
 
   // |delegate_| is used to notify the browser process of the player status, so
   // that the browser process can control screen locks.
   // TODO(qinmin): Currently android mediaplayer takes care of the screen
   // lock. So this is only used for media source. Will apply this to regular
@@ skipping 136 matching lines @@
   // Non-owned pointer to the CDM. Updated via calls to
   // setContentDecryptionModule().
   WebContentDecryptionModuleImpl* web_cdm_;
 
   // This is only Used by Clear Key key system implementation, where a renderer
   // side CDM will be used. This is similar to WebMediaPlayerImpl. For other key
   // systems, a browser side CDM will be used and we set CDM by calling
   // player_manager_->SetCdm() directly.
   media::DecryptorReadyCB decryptor_ready_cb_;
 
-  SkBitmap bitmap_;
+  media::SkCanvasVideoRenderer skcanvas_video_renderer_;
 
   // Whether stored credentials are allowed to be passed to the server.
   bool allow_stored_credentials_;
 
   // Whether the resource is local.
   bool is_local_resource_;
 
   // base::TickClock used by |interpolator_|.
   base::DefaultTickClock default_tick_clock_;
 
   // Tracks the most recent media time update and provides interpolated values
   // as playback progresses.
   media::TimeDeltaInterpolator interpolator_;
 
   scoped_ptr<MediaSourceDelegate> media_source_delegate_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_