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

Unified Diff: content/renderer/media/webmediaplayer_ms.cc

Issue 2791813003: Fix broken draw/upload paths from videos to 2D canvas and WebGL. (Closed)
Patch Set: Disable GPU-GPU copies to floating-point textures on Android. Created 3 years, 8 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: content/renderer/media/webmediaplayer_ms.cc
diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc
index 98f53696015e6367e7efca0d852566b36c38d788..e2adb5470e004d893d3c6946cffb2e30cfefddd7 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -578,6 +578,9 @@ void WebMediaPlayerMS::OnBecamePersistentVideo(bool value) {
bool WebMediaPlayerMS::CopyVideoTextureToPlatformTexture(
gpu::gles2::GLES2Interface* gl,
unsigned int texture,
+ unsigned internal_format,
+ unsigned format,
+ unsigned type,
bool premultiply_alpha,
bool flip_y) {
TRACE_EVENT0("media", "WebMediaPlayerMS:copyVideoTextureToPlatformTexture");
@@ -598,7 +601,8 @@ bool WebMediaPlayerMS::CopyVideoTextureToPlatformTexture(
context_3d = media::Context3D(provider->ContextGL(), provider->GrContext());
DCHECK(context_3d.gl);
return video_renderer_.CopyVideoFrameTexturesToGLTexture(
- context_3d, gl, video_frame.get(), texture, premultiply_alpha, flip_y);
+ context_3d, gl, video_frame.get(), texture, internal_format, format, type,
+ premultiply_alpha, flip_y);
}
bool WebMediaPlayerMS::TexImageImpl(TexImageFunctionID functionID,
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.h ('k') | content/test/gpu/gpu_tests/webgl2_conformance_expectations.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698