Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(426)

Unified Diff: webkit/media/android/webmediaplayer_android.cc

Issue 13620008: Enable 2D Canvas painting for Chrome on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing Frank's comments. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/media/android/webmediaplayer_android.cc
diff --git a/webkit/media/android/webmediaplayer_android.cc b/webkit/media/android/webmediaplayer_android.cc
index 5b00e5dbd3c31626a8eb0ff1563c1f33463dccee..92c0ceb4758495c64769617af53f606f449395b5 100644
--- a/webkit/media/android/webmediaplayer_android.cc
+++ b/webkit/media/android/webmediaplayer_android.cc
@@ -8,6 +8,7 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "cc/layers/video_layer.h"
+#include "gpu/GLES2/gl2extchromium.h"
#include "media/base/android/media_player_bridge.h"
#include "media/base/video_frame.h"
#include "net/base/mime_util.h"
@@ -246,6 +247,34 @@ void WebMediaPlayerAndroid::paint(WebKit::WebCanvas* canvas,
NOTIMPLEMENTED();
}
+bool WebMediaPlayerAndroid::copyVideoTextureToPlatformTexture(
+ WebKit::WebGraphicsContext3D* web_graphics_context,
+ unsigned int texture,
+ unsigned int level,
+ unsigned int internal_format,
+ bool premultiply_alpha,
+ bool flip_y) {
+ // TODO(hkuang): Check if there is valid frame uploaded to the texture?
+ uint32 source_texture = texture_id_;
qinmin 2013/04/07 21:52:29 if texture_id_ is 0, return false?
hkuang 2013/04/09 21:55:45 Done.
+
+ // The video is stored in a unmultiplied format, so premultiply if
+ // necessary.
+ web_graphics_context->pixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM,
+ premultiply_alpha);
+
+ // Application itself needs to take care of setting the right flip_y
+ // value down to get the expected result.
+ // flip_y==true means to reverse the video orientation while
+ // flip_y==false means to keep the intrinsic orientation.
+ web_graphics_context->pixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, flip_y);
+ web_graphics_context->copyTextureCHROMIUM(GL_TEXTURE_2D, source_texture,
+ texture, level, internal_format);
+ web_graphics_context->pixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, false);
+ web_graphics_context->pixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM,
+ false);
+ return true;
+}
+
bool WebMediaPlayerAndroid::hasSingleSecurityOrigin() const {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698